Skip to content

Commit 1d61a41

Browse files
Michael Rubingregkh
authored andcommitted
staging: gpib: pc2: 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 f3ac015 commit 1d61a41

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

drivers/staging/gpib/pc2/pc2_gpib.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ MODULE_DESCRIPTION("GPIB driver for PC2/PC2a and compatible devices");
5858

5959
irqreturn_t pc2_interrupt(int irq, void *arg)
6060
{
61-
gpib_board_t *board = arg;
61+
struct gpib_board *board = arg;
6262
struct pc2_priv *priv = board->private_data;
6363
unsigned long flags;
6464
irqreturn_t retval;
@@ -71,7 +71,7 @@ irqreturn_t pc2_interrupt(int irq, void *arg)
7171

7272
irqreturn_t pc2a_interrupt(int irq, void *arg)
7373
{
74-
gpib_board_t *board = arg;
74+
struct gpib_board *board = arg;
7575
struct pc2_priv *priv = board->private_data;
7676
int status1, status2;
7777
unsigned long flags;
@@ -90,149 +90,149 @@ irqreturn_t pc2a_interrupt(int irq, void *arg)
9090
}
9191

9292
// wrappers for interface functions
93-
static int pc2_read(gpib_board_t *board, uint8_t *buffer, size_t length, int *end,
93+
static int pc2_read(struct gpib_board *board, uint8_t *buffer, size_t length, int *end,
9494
size_t *bytes_read)
9595
{
9696
struct pc2_priv *priv = board->private_data;
9797

9898
return nec7210_read(board, &priv->nec7210_priv, buffer, length, end, bytes_read);
9999
}
100100

101-
static int pc2_write(gpib_board_t *board, uint8_t *buffer, size_t length, int send_eoi,
101+
static int pc2_write(struct gpib_board *board, uint8_t *buffer, size_t length, int send_eoi,
102102
size_t *bytes_written)
103103
{
104104
struct pc2_priv *priv = board->private_data;
105105

106106
return nec7210_write(board, &priv->nec7210_priv, buffer, length, send_eoi, bytes_written);
107107
}
108108

109-
static int pc2_command(gpib_board_t *board, uint8_t *buffer, size_t length, size_t *bytes_written)
109+
static int pc2_command(struct gpib_board *board, uint8_t *buffer, size_t length, size_t *bytes_written)
110110
{
111111
struct pc2_priv *priv = board->private_data;
112112

113113
return nec7210_command(board, &priv->nec7210_priv, buffer, length, bytes_written);
114114
}
115115

116-
static int pc2_take_control(gpib_board_t *board, int synchronous)
116+
static int pc2_take_control(struct gpib_board *board, int synchronous)
117117
{
118118
struct pc2_priv *priv = board->private_data;
119119

120120
return nec7210_take_control(board, &priv->nec7210_priv, synchronous);
121121
}
122122

123-
static int pc2_go_to_standby(gpib_board_t *board)
123+
static int pc2_go_to_standby(struct gpib_board *board)
124124
{
125125
struct pc2_priv *priv = board->private_data;
126126

127127
return nec7210_go_to_standby(board, &priv->nec7210_priv);
128128
}
129129

130-
static void pc2_request_system_control(gpib_board_t *board, int request_control)
130+
static void pc2_request_system_control(struct gpib_board *board, int request_control)
131131
{
132132
struct pc2_priv *priv = board->private_data;
133133

134134
nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
135135
}
136136

137-
static void pc2_interface_clear(gpib_board_t *board, int assert)
137+
static void pc2_interface_clear(struct gpib_board *board, int assert)
138138
{
139139
struct pc2_priv *priv = board->private_data;
140140

141141
nec7210_interface_clear(board, &priv->nec7210_priv, assert);
142142
}
143143

144-
static void pc2_remote_enable(gpib_board_t *board, int enable)
144+
static void pc2_remote_enable(struct gpib_board *board, int enable)
145145
{
146146
struct pc2_priv *priv = board->private_data;
147147

148148
nec7210_remote_enable(board, &priv->nec7210_priv, enable);
149149
}
150150

151-
static int pc2_enable_eos(gpib_board_t *board, uint8_t eos_byte, int compare_8_bits)
151+
static int pc2_enable_eos(struct gpib_board *board, uint8_t eos_byte, int compare_8_bits)
152152
{
153153
struct pc2_priv *priv = board->private_data;
154154

155155
return nec7210_enable_eos(board, &priv->nec7210_priv, eos_byte, compare_8_bits);
156156
}
157157

158-
static void pc2_disable_eos(gpib_board_t *board)
158+
static void pc2_disable_eos(struct gpib_board *board)
159159
{
160160
struct pc2_priv *priv = board->private_data;
161161

162162
nec7210_disable_eos(board, &priv->nec7210_priv);
163163
}
164164

165-
static unsigned int pc2_update_status(gpib_board_t *board, unsigned int clear_mask)
165+
static unsigned int pc2_update_status(struct gpib_board *board, unsigned int clear_mask)
166166
{
167167
struct pc2_priv *priv = board->private_data;
168168

169169
return nec7210_update_status(board, &priv->nec7210_priv, clear_mask);
170170
}
171171

172-
static int pc2_primary_address(gpib_board_t *board, unsigned int address)
172+
static int pc2_primary_address(struct gpib_board *board, unsigned int address)
173173
{
174174
struct pc2_priv *priv = board->private_data;
175175

176176
return nec7210_primary_address(board, &priv->nec7210_priv, address);
177177
}
178178

179-
static int pc2_secondary_address(gpib_board_t *board, unsigned int address, int enable)
179+
static int pc2_secondary_address(struct gpib_board *board, unsigned int address, int enable)
180180
{
181181
struct pc2_priv *priv = board->private_data;
182182

183183
return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
184184
}
185185

186-
static int pc2_parallel_poll(gpib_board_t *board, uint8_t *result)
186+
static int pc2_parallel_poll(struct gpib_board *board, uint8_t *result)
187187
{
188188
struct pc2_priv *priv = board->private_data;
189189

190190
return nec7210_parallel_poll(board, &priv->nec7210_priv, result);
191191
}
192192

193-
static void pc2_parallel_poll_configure(gpib_board_t *board, uint8_t config)
193+
static void pc2_parallel_poll_configure(struct gpib_board *board, uint8_t config)
194194
{
195195
struct pc2_priv *priv = board->private_data;
196196

197197
nec7210_parallel_poll_configure(board, &priv->nec7210_priv, config);
198198
}
199199

200-
static void pc2_parallel_poll_response(gpib_board_t *board, int ist)
200+
static void pc2_parallel_poll_response(struct gpib_board *board, int ist)
201201
{
202202
struct pc2_priv *priv = board->private_data;
203203

204204
nec7210_parallel_poll_response(board, &priv->nec7210_priv, ist);
205205
}
206206

207-
static void pc2_serial_poll_response(gpib_board_t *board, uint8_t status)
207+
static void pc2_serial_poll_response(struct gpib_board *board, uint8_t status)
208208
{
209209
struct pc2_priv *priv = board->private_data;
210210

211211
nec7210_serial_poll_response(board, &priv->nec7210_priv, status);
212212
}
213213

214-
static uint8_t pc2_serial_poll_status(gpib_board_t *board)
214+
static uint8_t pc2_serial_poll_status(struct gpib_board *board)
215215
{
216216
struct pc2_priv *priv = board->private_data;
217217

218218
return nec7210_serial_poll_status(board, &priv->nec7210_priv);
219219
}
220220

221-
static unsigned int pc2_t1_delay(gpib_board_t *board, unsigned int nano_sec)
221+
static unsigned int pc2_t1_delay(struct gpib_board *board, unsigned int nano_sec)
222222
{
223223
struct pc2_priv *priv = board->private_data;
224224

225225
return nec7210_t1_delay(board, &priv->nec7210_priv, nano_sec);
226226
}
227227

228-
static void pc2_return_to_local(gpib_board_t *board)
228+
static void pc2_return_to_local(struct gpib_board *board)
229229
{
230230
struct pc2_priv *priv = board->private_data;
231231

232232
nec7210_return_to_local(board, &priv->nec7210_priv);
233233
}
234234

235-
static int allocate_private(gpib_board_t *board)
235+
static int allocate_private(struct gpib_board *board)
236236
{
237237
struct pc2_priv *priv;
238238

@@ -245,13 +245,13 @@ static int allocate_private(gpib_board_t *board)
245245
return 0;
246246
}
247247

248-
static void free_private(gpib_board_t *board)
248+
static void free_private(struct gpib_board *board)
249249
{
250250
kfree(board->private_data);
251251
board->private_data = NULL;
252252
}
253253

254-
static int pc2_generic_attach(gpib_board_t *board, const gpib_board_config_t *config,
254+
static int pc2_generic_attach(struct gpib_board *board, const gpib_board_config_t *config,
255255
enum nec7210_chipset chipset)
256256
{
257257
struct pc2_priv *pc2_priv;
@@ -294,7 +294,7 @@ static int pc2_generic_attach(gpib_board_t *board, const gpib_board_config_t *co
294294
return 0;
295295
}
296296

297-
static int pc2_attach(gpib_board_t *board, const gpib_board_config_t *config)
297+
static int pc2_attach(struct gpib_board *board, const gpib_board_config_t *config)
298298
{
299299
int isr_flags = 0;
300300
struct pc2_priv *pc2_priv;
@@ -338,7 +338,7 @@ static int pc2_attach(gpib_board_t *board, const gpib_board_config_t *config)
338338
return 0;
339339
}
340340

341-
static void pc2_detach(gpib_board_t *board)
341+
static void pc2_detach(struct gpib_board *board)
342342
{
343343
struct pc2_priv *pc2_priv = board->private_data;
344344
struct nec7210_priv *nec_priv;
@@ -365,7 +365,7 @@ static void pc2_detach(gpib_board_t *board)
365365
free_private(board);
366366
}
367367

368-
static int pc2a_common_attach(gpib_board_t *board, const gpib_board_config_t *config,
368+
static int pc2a_common_attach(struct gpib_board *board, const gpib_board_config_t *config,
369369
unsigned int num_registers, enum nec7210_chipset chipset)
370370
{
371371
unsigned int i, j;
@@ -459,22 +459,22 @@ static int pc2a_common_attach(gpib_board_t *board, const gpib_board_config_t *co
459459
return 0;
460460
}
461461

462-
static int pc2a_attach(gpib_board_t *board, const gpib_board_config_t *config)
462+
static int pc2a_attach(struct gpib_board *board, const gpib_board_config_t *config)
463463
{
464464
return pc2a_common_attach(board, config, pc2a_iosize, NEC7210);
465465
}
466466

467-
static int pc2a_cb7210_attach(gpib_board_t *board, const gpib_board_config_t *config)
467+
static int pc2a_cb7210_attach(struct gpib_board *board, const gpib_board_config_t *config)
468468
{
469469
return pc2a_common_attach(board, config, pc2a_iosize, CB7210);
470470
}
471471

472-
static int pc2_2a_attach(gpib_board_t *board, const gpib_board_config_t *config)
472+
static int pc2_2a_attach(struct gpib_board *board, const gpib_board_config_t *config)
473473
{
474474
return pc2a_common_attach(board, config, pc2_2a_iosize, NAT4882);
475475
}
476476

477-
static void pc2a_common_detach(gpib_board_t *board, unsigned int num_registers)
477+
static void pc2a_common_detach(struct gpib_board *board, unsigned int num_registers)
478478
{
479479
int i;
480480
struct pc2_priv *pc2_priv = board->private_data;
@@ -507,12 +507,12 @@ static void pc2a_common_detach(gpib_board_t *board, unsigned int num_registers)
507507
free_private(board);
508508
}
509509

510-
static void pc2a_detach(gpib_board_t *board)
510+
static void pc2a_detach(struct gpib_board *board)
511511
{
512512
pc2a_common_detach(board, pc2a_iosize);
513513
}
514514

515-
static void pc2_2a_detach(gpib_board_t *board)
515+
static void pc2_2a_detach(struct gpib_board *board)
516516
{
517517
pc2a_common_detach(board, pc2_2a_iosize);
518518
}

0 commit comments

Comments
 (0)