Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

siimage: fix wrong ->swdma_mask

This driver doesn't support SWDMA so use the correct ->swdma_mask.

While at it:

* no need to call config_chipset_for_pio() in config_chipset_for_dma(),
if DMA is not available config_chipset_for_pio() will be called
by siimage_config_drive_for_dma() and if DMA is available
config_siimage_chipset_for_pio() will be called by siimage_tune_chipset()

* remove needless config_chipset_for_pio() wrapper

* bump driver version

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

+2 -10
+2 -10
drivers/ide/pci/siimage.c
··· 1 1 /* 2 - * linux/drivers/ide/pci/siimage.c Version 1.11 Jan 27, 2007 2 + * linux/drivers/ide/pci/siimage.c Version 1.12 Mar 10 2007 3 3 * 4 4 * Copyright (C) 2001-2002 Andre Hedrick <andre@linux-ide.org> 5 5 * Copyright (C) 2003 Red Hat <alan@redhat.com> ··· 287 287 (void) ide_config_drive_speed(drive, speed); 288 288 } 289 289 290 - static void config_chipset_for_pio (ide_drive_t *drive, byte set_speed) 291 - { 292 - config_siimage_chipset_for_pio(drive, set_speed); 293 - } 294 - 295 290 /** 296 291 * siimage_tune_chipset - set controller timings 297 292 * @drive: Drive to set up ··· 391 396 { 392 397 u8 speed = ide_dma_speed(drive, siimage_ratemask(drive)); 393 398 394 - config_chipset_for_pio(drive, !speed); 395 - 396 399 if (!speed) 397 400 return 0; 398 401 ··· 416 423 return 0; 417 424 418 425 if (ide_use_fast_pio(drive)) 419 - config_chipset_for_pio(drive, 1); 426 + config_siimage_chipset_for_pio(drive, 1); 420 427 421 428 return -1; 422 429 } ··· 1008 1015 1009 1016 hwif->ultra_mask = 0x7f; 1010 1017 hwif->mwdma_mask = 0x07; 1011 - hwif->swdma_mask = 0x07; 1012 1018 1013 1019 if (!is_sata(hwif)) 1014 1020 hwif->atapi_dma = 1;