diff options
-rw-r--r-- | drivers/block/paride/comm.c | 16 | ||||
-rw-r--r-- | drivers/block/paride/on26.c | 2 | ||||
-rw-r--r-- | drivers/net/8139too.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/block/paride/comm.c b/drivers/block/paride/comm.c index d842956edf76..43d61359d8ec 100644 --- a/drivers/block/paride/comm.c +++ b/drivers/block/paride/comm.c | |||
@@ -60,7 +60,7 @@ static int comm_read_regr( PIA *pi, int cont, int regr ) | |||
60 | 60 | ||
61 | case 2: | 61 | case 2: |
62 | case 3: | 62 | case 3: |
63 | case 4: w3(r+0x20); r1(); | 63 | case 4: w3(r+0x20); (void)r1(); |
64 | w2(0x24); h = r4(); w2(4); | 64 | w2(0x24); h = r4(); w2(4); |
65 | return h; | 65 | return h; |
66 | 66 | ||
@@ -82,7 +82,7 @@ static void comm_write_regr( PIA *pi, int cont, int regr, int val ) | |||
82 | 82 | ||
83 | case 2: | 83 | case 2: |
84 | case 3: | 84 | case 3: |
85 | case 4: w3(r); r1(); w4(val); | 85 | case 4: w3(r); (void)r1(); w4(val); |
86 | break; | 86 | break; |
87 | } | 87 | } |
88 | } | 88 | } |
@@ -126,17 +126,17 @@ static void comm_read_block( PIA *pi, char * buf, int count ) | |||
126 | w2(4); | 126 | w2(4); |
127 | break; | 127 | break; |
128 | 128 | ||
129 | case 2: w3(0x68); r1(); w2(0x24); | 129 | case 2: w3(0x68); (void)r1(); w2(0x24); |
130 | for (i=0;i<count;i++) buf[i] = r4(); | 130 | for (i=0;i<count;i++) buf[i] = r4(); |
131 | w2(4); | 131 | w2(4); |
132 | break; | 132 | break; |
133 | 133 | ||
134 | case 3: w3(0x68); r1(); w2(0x24); | 134 | case 3: w3(0x68); (void)r1(); w2(0x24); |
135 | for (i=0;i<count/2;i++) ((u16 *)buf)[i] = r4w(); | 135 | for (i=0;i<count/2;i++) ((u16 *)buf)[i] = r4w(); |
136 | w2(4); | 136 | w2(4); |
137 | break; | 137 | break; |
138 | 138 | ||
139 | case 4: w3(0x68); r1(); w2(0x24); | 139 | case 4: w3(0x68); (void)r1(); w2(0x24); |
140 | for (i=0;i<count/4;i++) ((u32 *)buf)[i] = r4l(); | 140 | for (i=0;i<count/4;i++) ((u32 *)buf)[i] = r4l(); |
141 | w2(4); | 141 | w2(4); |
142 | break; | 142 | break; |
@@ -160,15 +160,15 @@ static void comm_write_block( PIA *pi, char * buf, int count ) | |||
160 | w2(5); w2(4); | 160 | w2(5); w2(4); |
161 | break; | 161 | break; |
162 | 162 | ||
163 | case 2: w3(0x48); r1(); | 163 | case 2: w3(0x48); (void)r1(); |
164 | for (k=0;k<count;k++) w4(buf[k^1]); | 164 | for (k=0;k<count;k++) w4(buf[k^1]); |
165 | break; | 165 | break; |
166 | 166 | ||
167 | case 3: w3(0x48); r1(); | 167 | case 3: w3(0x48); (void)r1(); |
168 | for (k=0;k<count/2;k++) w4w(pi_swab16(buf,k)); | 168 | for (k=0;k<count/2;k++) w4w(pi_swab16(buf,k)); |
169 | break; | 169 | break; |
170 | 170 | ||
171 | case 4: w3(0x48); r1(); | 171 | case 4: w3(0x48); (void)r1(); |
172 | for (k=0;k<count/4;k++) w4l(pi_swab32(buf,k)); | 172 | for (k=0;k<count/4;k++) w4l(pi_swab32(buf,k)); |
173 | break; | 173 | break; |
174 | 174 | ||
diff --git a/drivers/block/paride/on26.c b/drivers/block/paride/on26.c index 9f837d9a3639..0f833caa2101 100644 --- a/drivers/block/paride/on26.c +++ b/drivers/block/paride/on26.c | |||
@@ -66,7 +66,7 @@ static int on26_read_regr( PIA *pi, int cont, int regr ) | |||
66 | case 3: | 66 | case 3: |
67 | case 4: w3(1); w3(1); w2(5); w4(r); w2(4); | 67 | case 4: w3(1); w3(1); w2(5); w4(r); w2(4); |
68 | w3(0); w3(0); w2(0x24); a = r4(); w2(4); | 68 | w3(0); w3(0); w2(0x24); a = r4(); w2(4); |
69 | w2(0x24); r4(); w2(4); | 69 | w2(0x24); (void)r4(); w2(4); |
70 | return a; | 70 | return a; |
71 | 71 | ||
72 | } | 72 | } |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index f5ee064ab6b2..feae7832fc84 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -1131,7 +1131,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev) | |||
1131 | No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. | 1131 | No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. |
1132 | */ | 1132 | */ |
1133 | 1133 | ||
1134 | #define eeprom_delay() RTL_R32(Cfg9346) | 1134 | #define eeprom_delay() (void)RTL_R32(Cfg9346) |
1135 | 1135 | ||
1136 | /* The EEPROM commands include the alway-set leading bit. */ | 1136 | /* The EEPROM commands include the alway-set leading bit. */ |
1137 | #define EE_WRITE_CMD (5) | 1137 | #define EE_WRITE_CMD (5) |