Skip to content

Commit 65db10c

Browse files
damien-lemoaldamien-lemoal
committed
ata: pata_parport: Fix kbic module code indentation and style
Fix the header, indentation and coding style in the kbic pata parport protocol module to suppress warnings from smatch and other static code analyzers. No functional changes. Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent bd91cbf commit 65db10c

1 file changed

Lines changed: 162 additions & 152 deletions

File tree

  • drivers/ata/pata_parport

‎drivers/ata/pata_parport/kbic.c‎

Lines changed: 162 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
12
/*
2-
kbic.c (c) 1997-8 Grant R. Guenther <grant@torque.net>
3-
Under the terms of the GNU General Public License.
4-
5-
This is a low-level driver for the KBIC-951A and KBIC-971A
6-
parallel to IDE adapter chips from KingByte Information Systems.
7-
8-
The chips are almost identical, however, the wakeup code
9-
required for the 971A interferes with the correct operation of
10-
the 951A, so this driver registers itself twice, once for
11-
each chip.
12-
13-
*/
3+
* (c) 1997-1998 Grant R. Guenther <grant@torque.net>
4+
*
5+
* This is a low-level driver for the KBIC-951A and KBIC-971A
6+
* parallel to IDE adapter chips from KingByte Information Systems.
7+
*
8+
* The chips are almost identical, however, the wakeup code
9+
* required for the 971A interferes with the correct operation of
10+
* the 951A, so this driver registers itself twice, once for
11+
* each chip.
12+
*/
1413

1514
#include <linux/module.h>
1615
#include <linux/init.h>
@@ -21,212 +20,223 @@
2120
#include <asm/io.h>
2221
#include "pata_parport.h"
2322

24-
#define r12w() (delay_p,inw(pi->port+1)&0xffff)
23+
#define r12w() (delay_p, inw(pi->port + 1) & 0xffff)
2524

26-
#define j44(a,b) ((((a>>4)&0x0f)|(b&0xf0))^0x88)
27-
#define j53(w) (((w>>3)&0x1f)|((w>>4)&0xe0))
25+
#define j44(a, b) ((((a >> 4) & 0x0f) | (b & 0xf0)) ^ 0x88)
26+
#define j53(w) (((w >> 3) & 0x1f) | ((w >> 4) & 0xe0))
2827

2928

30-
/* cont = 0 - access the IDE register file
31-
cont = 1 - access the IDE command set
32-
*/
33-
34-
static int cont_map[2] = { 0x80, 0x40 };
29+
/*
30+
* cont = 0 - access the IDE register file
31+
* cont = 1 - access the IDE command set
32+
*/
33+
static int cont_map[2] = { 0x80, 0x40 };
3534

3635
static int kbic_read_regr(struct pi_adapter *pi, int cont, int regr)
36+
{
37+
int a, b, s;
3738

38-
{ int a, b, s;
39-
40-
s = cont_map[cont];
39+
s = cont_map[cont];
4140

4241
switch (pi->mode) {
43-
44-
case 0: w0(regr|0x18|s); w2(4); w2(6); w2(4); w2(1); w0(8);
45-
a = r1(); w0(0x28); b = r1(); w2(4);
46-
return j44(a,b);
47-
48-
case 1: w0(regr|0x38|s); w2(4); w2(6); w2(4); w2(5); w0(8);
42+
case 0:
43+
w0(regr | 0x18 | s); w2(4); w2(6); w2(4); w2(1); w0(8);
44+
a = r1(); w0(0x28); b = r1(); w2(4);
45+
return j44(a, b);
46+
case 1:
47+
w0(regr|0x38 | s); w2(4); w2(6); w2(4); w2(5); w0(8);
4948
a = r12w(); w2(4);
5049
return j53(a);
51-
52-
case 2: w0(regr|0x08|s); w2(4); w2(6); w2(4); w2(0xa5); w2(0xa1);
50+
case 2:
51+
w0(regr | 0x08 | s); w2(4); w2(6); w2(4); w2(0xa5); w2(0xa1);
5352
a = r0(); w2(4);
54-
return a;
55-
53+
return a;
5654
case 3:
5755
case 4:
58-
case 5: w0(0x20|s); w2(4); w2(6); w2(4); w3(regr);
56+
case 5:
57+
w0(0x20 | s); w2(4); w2(6); w2(4); w3(regr);
5958
a = r4(); b = r4(); w2(4); w2(0); w2(4);
6059
return a;
61-
6260
}
61+
6362
return -1;
64-
}
63+
}
6564

6665
static void kbic_write_regr(struct pi_adapter *pi, int cont, int regr, int val)
66+
{
67+
int s = cont_map[cont];
6768

68-
{ int s;
69-
70-
s = cont_map[cont];
71-
72-
switch (pi->mode) {
73-
74-
case 0:
75-
case 1:
76-
case 2: w0(regr|0x10|s); w2(4); w2(6); w2(4);
69+
switch (pi->mode) {
70+
case 0:
71+
case 1:
72+
case 2:
73+
w0(regr | 0x10 | s); w2(4); w2(6); w2(4);
7774
w0(val); w2(5); w2(4);
7875
break;
79-
8076
case 3:
8177
case 4:
82-
case 5: w0(0x20|s); w2(4); w2(6); w2(4); w3(regr);
78+
case 5:
79+
w0(0x20 | s); w2(4); w2(6); w2(4); w3(regr);
8380
w4(val); w4(val);
8481
w2(4); w2(0); w2(4);
85-
break;
86-
82+
break;
8783
}
8884
}
8985

9086
static void k951_connect(struct pi_adapter *pi)
91-
92-
{ pi->saved_r0 = r0();
93-
pi->saved_r2 = r2();
94-
w2(4);
87+
{
88+
pi->saved_r0 = r0();
89+
pi->saved_r2 = r2();
90+
w2(4);
9591
}
9692

9793
static void k951_disconnect(struct pi_adapter *pi)
98-
99-
{ w0(pi->saved_r0);
100-
w2(pi->saved_r2);
94+
{
95+
w0(pi->saved_r0);
96+
w2(pi->saved_r2);
10197
}
10298

103-
#define CCP(x) w2(0xc4);w0(0xaa);w0(0x55);w0(0);w0(0xff);w0(0x87);\
104-
w0(0x78);w0(x);w2(0xc5);w2(0xc4);w0(0xff);
99+
#define CCP(x) \
100+
do { \
101+
w2(0xc4); w0(0xaa); w0(0x55); \
102+
w0(0); w0(0xff); w0(0x87); \
103+
w0(0x78); w0(x); w2(0xc5); \
104+
w2(0xc4); w0(0xff); \
105+
} while (0)
105106

106107
static void k971_connect(struct pi_adapter *pi)
107-
108-
{ pi->saved_r0 = r0();
109-
pi->saved_r2 = r2();
108+
{
109+
pi->saved_r0 = r0();
110+
pi->saved_r2 = r2();
110111
CCP(0x20);
111-
w2(4);
112+
w2(4);
112113
}
113114

114115
static void k971_disconnect(struct pi_adapter *pi)
115-
116-
{ CCP(0x30);
116+
{
117+
CCP(0x30);
117118
w0(pi->saved_r0);
118-
w2(pi->saved_r2);
119+
w2(pi->saved_r2);
119120
}
120121

121-
/* counts must be congruent to 0 MOD 4, but all known applications
122-
have this property.
123-
*/
124-
122+
/*
123+
* count must be congruent to 0 MOD 4, but all known applications
124+
*have this property.
125+
*/
125126
static void kbic_read_block(struct pi_adapter *pi, char *buf, int count)
127+
{
128+
int k, a, b;
126129

127-
{ int k, a, b;
128-
129-
switch (pi->mode) {
130-
131-
case 0: w0(0x98); w2(4); w2(6); w2(4);
132-
for (k=0;k<count/2;k++) {
133-
w2(1); w0(8); a = r1();
134-
w0(0x28); b = r1();
135-
buf[2*k] = j44(a,b);
136-
w2(5); b = r1();
137-
w0(8); a = r1();
138-
buf[2*k+1] = j44(a,b);
130+
switch (pi->mode) {
131+
case 0:
132+
w0(0x98); w2(4); w2(6); w2(4);
133+
for (k = 0; k < count / 2; k++) {
134+
w2(1); w0(8);
135+
a = r1();
136+
w0(0x28);
137+
b = r1();
138+
buf[2 * k] = j44(a, b);
139+
w2(5);
140+
b = r1();
141+
w0(8);
142+
a = r1();
143+
buf[2 * k + 1] = j44(a, b);
139144
w2(4);
140-
}
141-
break;
142-
143-
case 1: w0(0xb8); w2(4); w2(6); w2(4);
144-
for (k=0;k<count/4;k++) {
145-
w0(0xb8);
146-
w2(4); w2(5);
147-
w0(8); buf[4*k] = j53(r12w());
148-
w0(0xb8); buf[4*k+1] = j53(r12w());
145+
}
146+
break;
147+
case 1:
148+
w0(0xb8); w2(4); w2(6); w2(4);
149+
for (k = 0; k < count / 4; k++) {
150+
w0(0xb8);
149151
w2(4); w2(5);
150-
buf[4*k+3] = j53(r12w());
151-
w0(8); buf[4*k+2] = j53(r12w());
152-
}
153-
w2(4);
154-
break;
155-
156-
case 2: w0(0x88); w2(4); w2(6); w2(4);
157-
for (k=0;k<count/2;k++) {
158-
w2(0xa0); w2(0xa1); buf[2*k] = r0();
159-
w2(0xa5); buf[2*k+1] = r0();
160-
}
161-
w2(4);
162-
break;
163-
164-
case 3: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
165-
for (k=0;k<count;k++) buf[k] = r4();
166-
w2(4); w2(0); w2(4);
167-
break;
168-
169-
case 4: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
170-
for (k=0;k<count/2;k++) ((u16 *)buf)[k] = r4w();
171-
w2(4); w2(0); w2(4);
172-
break;
173-
174-
case 5: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
175-
for (k=0;k<count/4;k++) ((u32 *)buf)[k] = r4l();
176-
w2(4); w2(0); w2(4);
177-
break;
178-
179-
180-
}
152+
w0(8);
153+
buf[4 * k] = j53(r12w());
154+
w0(0xb8);
155+
buf[4 * k + 1] = j53(r12w());
156+
w2(4); w2(5);
157+
buf[4 * k + 3] = j53(r12w());
158+
w0(8);
159+
buf[4 * k + 2] = j53(r12w());
160+
}
161+
w2(4);
162+
break;
163+
case 2:
164+
w0(0x88); w2(4); w2(6); w2(4);
165+
for (k = 0; k < count / 2; k++) {
166+
w2(0xa0); w2(0xa1);
167+
buf[2 * k] = r0();
168+
w2(0xa5);
169+
buf[2 * k + 1] = r0();
170+
}
171+
w2(4);
172+
break;
173+
case 3:
174+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
175+
for (k = 0; k < count; k++)
176+
buf[k] = r4();
177+
w2(4); w2(0); w2(4);
178+
break;
179+
case 4:
180+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
181+
for (k = 0; k < count / 2; k++)
182+
((u16 *)buf)[k] = r4w();
183+
w2(4); w2(0); w2(4);
184+
break;
185+
case 5:
186+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
187+
for (k = 0; k < count / 4; k++)
188+
((u32 *)buf)[k] = r4l();
189+
w2(4); w2(0); w2(4);
190+
break;
191+
}
181192
}
182193

183194
static void kbic_write_block(struct pi_adapter *pi, char *buf, int count)
195+
{
196+
int k;
184197

185-
{ int k;
186-
187-
switch (pi->mode) {
188-
189-
case 0:
190-
case 1:
191-
case 2: w0(0x90); w2(4); w2(6); w2(4);
192-
for(k=0;k<count/2;k++) {
193-
w0(buf[2*k+1]); w2(0); w2(4);
194-
w0(buf[2*k]); w2(5); w2(4);
198+
switch (pi->mode) {
199+
case 0:
200+
case 1:
201+
case 2:
202+
w0(0x90); w2(4); w2(6); w2(4);
203+
for (k = 0; k < count / 2; k++) {
204+
w0(buf[2 * k + 1]);
205+
w2(0); w2(4);
206+
w0(buf[2 * k]);
207+
w2(5); w2(4);
195208
}
196209
break;
197-
198-
case 3: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
199-
for(k=0;k<count/2;k++) {
200-
w4(buf[2*k+1]);
201-
w4(buf[2*k]);
202-
}
210+
case 3:
211+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
212+
for (k = 0; k < count / 2; k++) {
213+
w4(buf[2 * k + 1]);
214+
w4(buf[2 * k]);
215+
}
203216
w2(4); w2(0); w2(4);
204217
break;
205-
206-
case 4: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
218+
case 4:
219+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
207220
for (k = 0; k < count / 2; k++)
208221
w4w(swab16(((u16 *)buf)[k]));
209-
w2(4); w2(0); w2(4);
210-
break;
211-
212-
case 5: w0(0xa0); w2(4); w2(6); w2(4); w3(0);
222+
w2(4); w2(0); w2(4);
223+
break;
224+
case 5:
225+
w0(0xa0); w2(4); w2(6); w2(4); w3(0);
213226
for (k = 0; k < count / 4; k++)
214227
w4l(swab16(((u16 *)buf)[2 * k]) |
215228
swab16(((u16 *)buf)[2 * k + 1]) << 16);
216-
w2(4); w2(0); w2(4);
217-
break;
218-
219-
}
220-
229+
w2(4); w2(0); w2(4);
230+
break;
231+
}
221232
}
222233

223234
static void kbic_log_adapter(struct pi_adapter *pi, char *chip)
224-
225-
{ char *mode_string[6] = {"4-bit","5/3","8-bit",
226-
"EPP-8","EPP_16","EPP-32"};
235+
{
236+
char *mode[6] = { "4-bit", "5/3", "8-bit", "EPP-8", "EPP_16", "EPP-32"};
227237

228238
dev_info(&pi->dev, "KingByte %s at 0x%x, mode %d (%s), delay %d\n",
229-
chip, pi->port, pi->mode, mode_string[pi->mode], pi->delay);
239+
chip, pi->port, pi->mode, mode[pi->mode], pi->delay);
230240
}
231241

232242
static void k951_log_adapter(struct pi_adapter *pi)

0 commit comments

Comments
 (0)