diff options
Diffstat (limited to 'drivers/ide/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 67f06dd11b34..bd4c1d3070e4 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -284,28 +284,6 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
284 | } | 284 | } |
285 | 285 | ||
286 | /** | 286 | /** |
287 | * scc_configure_drive_for_dma - set up for DMA transfers | ||
288 | * @drive: drive we are going to set up | ||
289 | * | ||
290 | * Set up the drive for DMA, tune the controller and drive as | ||
291 | * required. | ||
292 | * If the drive isn't suitable for DMA or we hit other problems | ||
293 | * then we will drop down to PIO and set up PIO appropriately. | ||
294 | * (return -1) | ||
295 | */ | ||
296 | |||
297 | static int scc_config_drive_for_dma(ide_drive_t *drive) | ||
298 | { | ||
299 | if (ide_tune_dma(drive)) | ||
300 | return 0; | ||
301 | |||
302 | if (ide_use_fast_pio(drive)) | ||
303 | ide_set_max_pio(drive); | ||
304 | |||
305 | return -1; | ||
306 | } | ||
307 | |||
308 | /** | ||
309 | * scc_ide_dma_setup - begin a DMA phase | 287 | * scc_ide_dma_setup - begin a DMA phase |
310 | * @drive: target device | 288 | * @drive: target device |
311 | * | 289 | * |
@@ -702,7 +680,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
702 | hwif->ide_dma_end = scc_ide_dma_end; | 680 | hwif->ide_dma_end = scc_ide_dma_end; |
703 | hwif->set_pio_mode = scc_set_pio_mode; | 681 | hwif->set_pio_mode = scc_set_pio_mode; |
704 | hwif->set_dma_mode = scc_set_dma_mode; | 682 | hwif->set_dma_mode = scc_set_dma_mode; |
705 | hwif->ide_dma_check = scc_config_drive_for_dma; | ||
706 | hwif->ide_dma_test_irq = scc_dma_test_irq; | 683 | hwif->ide_dma_test_irq = scc_dma_test_irq; |
707 | hwif->udma_filter = scc_udma_filter; | 684 | hwif->udma_filter = scc_udma_filter; |
708 | 685 | ||
@@ -720,12 +697,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
720 | 697 | ||
721 | /* we support 80c cable only. */ | 698 | /* we support 80c cable only. */ |
722 | hwif->cbl = ATA_CBL_PATA80; | 699 | hwif->cbl = ATA_CBL_PATA80; |
723 | |||
724 | hwif->autodma = 0; | ||
725 | if (!noautodma) | ||
726 | hwif->autodma = 1; | ||
727 | hwif->drives[0].autodma = hwif->autodma; | ||
728 | hwif->drives[1].autodma = hwif->autodma; | ||
729 | } | 700 | } |
730 | 701 | ||
731 | #define DECLARE_SCC_DEV(name_str) \ | 702 | #define DECLARE_SCC_DEV(name_str) \ |
@@ -793,8 +764,8 @@ static void __devexit scc_remove(struct pci_dev *dev) | |||
793 | memset(ports, 0, sizeof(*ports)); | 764 | memset(ports, 0, sizeof(*ports)); |
794 | } | 765 | } |
795 | 766 | ||
796 | static struct pci_device_id scc_pci_tbl[] = { | 767 | static const struct pci_device_id scc_pci_tbl[] = { |
797 | { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 768 | { PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0 }, |
798 | { 0, }, | 769 | { 0, }, |
799 | }; | 770 | }; |
800 | MODULE_DEVICE_TABLE(pci, scc_pci_tbl); | 771 | MODULE_DEVICE_TABLE(pci, scc_pci_tbl); |