Skip to content

Commit 344a50b

Browse files
Michael Rubingregkh
authored andcommitted
staging: gpib: lpvo_usb_gpib: struct gpib_board
Using Linux code style for struct gpib_board. Adhering to Linux code style. In general, a pointer, or a struct that has elements that can reasonably be directly accessed should never be a typedef. Signed-off-by: Michael Rubin <[email protected]> Acked-By: Dave Penkler <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 517c649 commit 344a50b

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ struct usb_gpib_priv { /* private data to the device */
146146

147147
#define GPIB_DEV (((struct usb_gpib_priv *)board->private_data)->dev)
148148

149-
static void show_status(gpib_board_t *board)
149+
static void show_status(struct gpib_board *board)
150150
{
151151
DIA_LOG(2, "# - buffer_length %d\n", board->buffer_length);
152152
DIA_LOG(2, "# - status %lx\n", board->status);
@@ -184,8 +184,8 @@ static struct mutex minors_lock; /* operations on usb_minors are to be prote
184184
struct usb_skel;
185185
static ssize_t skel_do_write(struct usb_skel *, const char *, size_t);
186186
static ssize_t skel_do_read(struct usb_skel *, char *, size_t);
187-
static int skel_do_open(gpib_board_t *, int);
188-
static int skel_do_release(gpib_board_t *);
187+
static int skel_do_open(struct gpib_board *, int);
188+
static int skel_do_release(struct gpib_board *);
189189

190190
/*
191191
* usec_diff : take difference in MICROsec between two 'timespec'
@@ -237,7 +237,7 @@ static int write_loop(void *dev, char *msg, int leng)
237237
* it has to be given explicitly.
238238
*/
239239

240-
static int send_command(gpib_board_t *board, char *msg, int leng)
240+
static int send_command(struct gpib_board *board, char *msg, int leng)
241241
{
242242
char buffer[64];
243243
int nchar;
@@ -278,7 +278,7 @@ static int send_command(gpib_board_t *board, char *msg, int leng)
278278
*
279279
*/
280280

281-
static int set_control_line(gpib_board_t *board, int line, int value)
281+
static int set_control_line(struct gpib_board *board, int line, int value)
282282
{
283283
char msg[] = USB_GPIB_SET_LINES;
284284
int retval;
@@ -309,7 +309,7 @@ static int set_control_line(gpib_board_t *board, int line, int value)
309309
* @char_buf: the routine private data structure
310310
*/
311311

312-
static int one_char(gpib_board_t *board, struct char_buf *b)
312+
static int one_char(struct gpib_board *board, struct char_buf *b)
313313
{
314314
struct timespec64 before, after;
315315

@@ -343,7 +343,7 @@ static int one_char(gpib_board_t *board, struct char_buf *b)
343343
* not supported.
344344
*/
345345

346-
static void set_timeout(gpib_board_t *board)
346+
static void set_timeout(struct gpib_board *board)
347347
{
348348
int n, val;
349349
char command[sizeof(USB_GPIB_TTMO) + 6];
@@ -391,7 +391,7 @@ static void set_timeout(gpib_board_t *board)
391391
* detach() will be called. Always.
392392
*/
393393

394-
static int usb_gpib_attach(gpib_board_t *board, const gpib_board_config_t *config)
394+
static int usb_gpib_attach(struct gpib_board *board, const gpib_board_config_t *config)
395395
{
396396
int retval, j;
397397
u32 base = config->ibbase;
@@ -510,7 +510,7 @@ static int usb_gpib_attach(gpib_board_t *board, const gpib_board_config_t *confi
510510
*
511511
*/
512512

513-
static void usb_gpib_detach(gpib_board_t *board)
513+
static void usb_gpib_detach(struct gpib_board *board)
514514
{
515515
int retval;
516516

@@ -537,7 +537,7 @@ static void usb_gpib_detach(gpib_board_t *board)
537537
* Other functions follow in alphabetical order
538538
*/
539539
/* command */
540-
static int usb_gpib_command(gpib_board_t *board,
540+
static int usb_gpib_command(struct gpib_board *board,
541541
u8 *buffer,
542542
size_t length,
543543
size_t *bytes_written)
@@ -570,7 +570,7 @@ static int usb_gpib_command(gpib_board_t *board,
570570
* Cannot do nothing here, but remember for future use.
571571
*/
572572

573-
static void usb_gpib_disable_eos(gpib_board_t *board)
573+
static void usb_gpib_disable_eos(struct gpib_board *board)
574574
{
575575
((struct usb_gpib_priv *)board->private_data)->eos_flags &= ~REOS;
576576
DIA_LOG(1, "done: %x\n",
@@ -586,7 +586,7 @@ static void usb_gpib_disable_eos(gpib_board_t *board)
586586
*
587587
*/
588588

589-
static int usb_gpib_enable_eos(gpib_board_t *board,
589+
static int usb_gpib_enable_eos(struct gpib_board *board,
590590
u8 eos_byte,
591591
int compare_8_bits)
592592
{
@@ -606,7 +606,7 @@ static int usb_gpib_enable_eos(gpib_board_t *board,
606606
* @board: the gpib_board data area for this gpib interface
607607
*/
608608

609-
static int usb_gpib_go_to_standby(gpib_board_t *board)
609+
static int usb_gpib_go_to_standby(struct gpib_board *board)
610610
{
611611
int retval = set_control_line(board, IB_BUS_ATN, 0);
612612

@@ -628,7 +628,7 @@ static int usb_gpib_go_to_standby(gpib_board_t *board)
628628
* the de-assert request.
629629
*/
630630

631-
static void usb_gpib_interface_clear(gpib_board_t *board, int assert)
631+
static void usb_gpib_interface_clear(struct gpib_board *board, int assert)
632632
{
633633
int retval = 0;
634634

@@ -655,7 +655,7 @@ static void usb_gpib_interface_clear(gpib_board_t *board, int assert)
655655
#define WQH head
656656
#define WQE entry
657657

658-
static int usb_gpib_line_status(const gpib_board_t *board)
658+
static int usb_gpib_line_status(const struct gpib_board *board)
659659
{
660660
int buffer;
661661
int line_status = VALID_ALL; /* all lines will be read */
@@ -686,7 +686,7 @@ static int usb_gpib_line_status(const gpib_board_t *board)
686686
msleep(sleep);
687687
}
688688

689-
buffer = send_command((gpib_board_t *)board, USB_GPIB_STATUS, 0);
689+
buffer = send_command((struct gpib_board *)board, USB_GPIB_STATUS, 0);
690690

691691
if (buffer < 0) {
692692
dev_err(board->gpib_dev, "line status read failed with %d\n", buffer);
@@ -717,7 +717,7 @@ static int usb_gpib_line_status(const gpib_board_t *board)
717717

718718
/* parallel_poll */
719719

720-
static int usb_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
720+
static int usb_gpib_parallel_poll(struct gpib_board *board, uint8_t *result)
721721
{
722722
/* request parallel poll asserting ATN | EOI;
723723
* we suppose ATN already asserted
@@ -744,7 +744,7 @@ static int usb_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
744744

745745
/* read */
746746

747-
static int usb_gpib_read(gpib_board_t *board,
747+
static int usb_gpib_read(struct gpib_board *board,
748748
u8 *buffer,
749749
size_t length,
750750
int *end,
@@ -908,7 +908,7 @@ static int usb_gpib_read(gpib_board_t *board,
908908

909909
/* remote_enable */
910910

911-
static void usb_gpib_remote_enable(gpib_board_t *board, int enable)
911+
static void usb_gpib_remote_enable(struct gpib_board *board, int enable)
912912
{
913913
int retval;
914914

@@ -921,7 +921,7 @@ static void usb_gpib_remote_enable(gpib_board_t *board, int enable)
921921

922922
/* request_system_control */
923923

924-
static void usb_gpib_request_system_control(gpib_board_t *board,
924+
static void usb_gpib_request_system_control(struct gpib_board *board,
925925
int request_control)
926926
{
927927
if (request_control)
@@ -935,7 +935,7 @@ static void usb_gpib_request_system_control(gpib_board_t *board,
935935
/* take_control */
936936
/* beware: the sync flag is ignored; what is its real meaning? */
937937

938-
static int usb_gpib_take_control(gpib_board_t *board, int sync)
938+
static int usb_gpib_take_control(struct gpib_board *board, int sync)
939939
{
940940
int retval;
941941

@@ -950,7 +950,7 @@ static int usb_gpib_take_control(gpib_board_t *board, int sync)
950950

951951
/* update_status */
952952

953-
static unsigned int usb_gpib_update_status(gpib_board_t *board,
953+
static unsigned int usb_gpib_update_status(struct gpib_board *board,
954954
unsigned int clear_mask)
955955
{
956956
/* There is nothing we can do here, I guess */
@@ -965,7 +965,7 @@ static unsigned int usb_gpib_update_status(gpib_board_t *board,
965965
/* write */
966966
/* beware: DLE characters are not escaped - can only send ASCII data */
967967

968-
static int usb_gpib_write(gpib_board_t *board,
968+
static int usb_gpib_write(struct gpib_board *board,
969969
u8 *buffer,
970970
size_t length,
971971
int send_eoi,
@@ -1008,33 +1008,33 @@ static int usb_gpib_write(gpib_board_t *board,
10081008

10091009
/* parallel_poll configure */
10101010

1011-
static void usb_gpib_parallel_poll_configure(gpib_board_t *board,
1011+
static void usb_gpib_parallel_poll_configure(struct gpib_board *board,
10121012
uint8_t configuration)
10131013
{
10141014
}
10151015

10161016
/* parallel_poll_response */
10171017

1018-
static void usb_gpib_parallel_poll_response(gpib_board_t *board, int ist)
1018+
static void usb_gpib_parallel_poll_response(struct gpib_board *board, int ist)
10191019
{
10201020
}
10211021

10221022
/* primary_address */
10231023

1024-
static int usb_gpib_primary_address(gpib_board_t *board, unsigned int address)
1024+
static int usb_gpib_primary_address(struct gpib_board *board, unsigned int address)
10251025
{
10261026
return 0;
10271027
}
10281028

10291029
/* return_to_local */
10301030

1031-
static void usb_gpib_return_to_local(gpib_board_t *board)
1031+
static void usb_gpib_return_to_local(struct gpib_board *board)
10321032
{
10331033
}
10341034

10351035
/* secondary_address */
10361036

1037-
static int usb_gpib_secondary_address(gpib_board_t *board,
1037+
static int usb_gpib_secondary_address(struct gpib_board *board,
10381038
unsigned int address,
10391039
int enable)
10401040
{
@@ -1043,20 +1043,20 @@ static int usb_gpib_secondary_address(gpib_board_t *board,
10431043

10441044
/* serial_poll_response */
10451045

1046-
static void usb_gpib_serial_poll_response(gpib_board_t *board, uint8_t status)
1046+
static void usb_gpib_serial_poll_response(struct gpib_board *board, uint8_t status)
10471047
{
10481048
}
10491049

10501050
/* serial_poll_status */
10511051

1052-
static uint8_t usb_gpib_serial_poll_status(gpib_board_t *board)
1052+
static uint8_t usb_gpib_serial_poll_status(struct gpib_board *board)
10531053
{
10541054
return 0;
10551055
}
10561056

10571057
/* t1_delay */
10581058

1059-
static unsigned int usb_gpib_t1_delay(gpib_board_t *board, unsigned int nano_sec)
1059+
static unsigned int usb_gpib_t1_delay(struct gpib_board *board, unsigned int nano_sec)
10601060
{
10611061
return 0;
10621062
}
@@ -1295,7 +1295,7 @@ static void skel_delete(struct kref *kref)
12951295
* skel_do_open() - to be called by usb_gpib_attach
12961296
*/
12971297

1298-
static int skel_do_open(gpib_board_t *board, int subminor)
1298+
static int skel_do_open(struct gpib_board *board, int subminor)
12991299
{
13001300
struct usb_skel *dev;
13011301
struct usb_interface *interface;
@@ -1332,7 +1332,7 @@ static int skel_do_open(gpib_board_t *board, int subminor)
13321332
* skel_do_release() - to be called by usb_gpib_detach
13331333
*/
13341334

1335-
static int skel_do_release(gpib_board_t *board)
1335+
static int skel_do_release(struct gpib_board *board)
13361336
{
13371337
struct usb_skel *dev;
13381338

0 commit comments

Comments
 (0)