aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-05-23 20:42:39 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-05-23 20:42:39 -0400
commit585a2858b970cb6e2e5ca4877eefd18b4dba8ed4 (patch)
treee004d00e5cc7ea80428d59bd91de99d0b2484bb8 /drivers/ide
parent5a6248cac22a77588f81c7473cfd03d250cc5b56 (diff)
ide serverworks warning fixes
gcc-4.3: drivers/ide/pci/serverworks.c: In function 'svwks_tune_chipset': drivers/ide/pci/serverworks.c:176: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:190: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:211: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:212: warning: overflow in implicit constant conversion Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/serverworks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 1f80c6d58805..47bcd91c9b5f 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -179,7 +179,7 @@ dma_pio:
179 ((dma_stat&(1<<(5+unit)))==(1<<(5+unit)))) { 179 ((dma_stat&(1<<(5+unit)))==(1<<(5+unit)))) {
180 u8 dmaspeed = dma_timing; 180 u8 dmaspeed = dma_timing;
181 181
182 dma_timing &= ~0xFF; 182 dma_timing &= ~0xFFU;
183 if ((dmaspeed & 0x20) == 0x20) 183 if ((dmaspeed & 0x20) == 0x20)
184 dmaspeed = XFER_MW_DMA_2; 184 dmaspeed = XFER_MW_DMA_2;
185 else if ((dmaspeed & 0x21) == 0x21) 185 else if ((dmaspeed & 0x21) == 0x21)
@@ -193,7 +193,7 @@ dma_pio:
193 } else if (pio_timing) { 193 } else if (pio_timing) {
194 u8 piospeed = pio_timing; 194 u8 piospeed = pio_timing;
195 195
196 pio_timing &= ~0xFF; 196 pio_timing &= ~0xFFU;
197 if ((piospeed & 0x20) == 0x20) 197 if ((piospeed & 0x20) == 0x20)
198 piospeed = XFER_PIO_4; 198 piospeed = XFER_PIO_4;
199 else if ((piospeed & 0x22) == 0x22) 199 else if ((piospeed & 0x22) == 0x22)
@@ -214,8 +214,8 @@ dma_pio:
214 214
215oem_setup_failed: 215oem_setup_failed:
216 216
217 pio_timing &= ~0xFF; 217 pio_timing &= ~0xFFU;
218 dma_timing &= ~0xFF; 218 dma_timing &= ~0xFFU;
219 ultra_timing &= ~(0x0F << (4*unit)); 219 ultra_timing &= ~(0x0F << (4*unit));
220 ultra_enable &= ~(0x01 << drive->dn); 220 ultra_enable &= ~(0x01 << drive->dn);
221 csb5_pio &= ~(0x0F << (4*drive->dn)); 221 csb5_pio &= ~(0x0F << (4*drive->dn));