diff options
Diffstat (limited to 'drivers/ide/pci/siimage.c')
-rw-r--r-- | drivers/ide/pci/siimage.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 8d624afe8529..b6be1b45f329 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -370,48 +370,6 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive) | |||
370 | } | 370 | } |
371 | 371 | ||
372 | /** | 372 | /** |
373 | * sil_sata_busproc - bus isolation IOCTL | ||
374 | * @drive: drive to isolate/restore | ||
375 | * @state: bus state to set | ||
376 | * | ||
377 | * Used by the SII3112 to handle bus isolation. As this is a | ||
378 | * SATA controller the work required is quite limited, we | ||
379 | * just have to clean up the statistics | ||
380 | */ | ||
381 | |||
382 | static int sil_sata_busproc(ide_drive_t * drive, int state) | ||
383 | { | ||
384 | ide_hwif_t *hwif = HWIF(drive); | ||
385 | struct pci_dev *dev = to_pci_dev(hwif->dev); | ||
386 | u32 stat_config = 0; | ||
387 | unsigned long addr = siimage_selreg(hwif, 0); | ||
388 | |||
389 | if (hwif->mmio) | ||
390 | stat_config = readl((void __iomem *)addr); | ||
391 | else | ||
392 | pci_read_config_dword(dev, addr, &stat_config); | ||
393 | |||
394 | switch (state) { | ||
395 | case BUSSTATE_ON: | ||
396 | hwif->drives[0].failures = 0; | ||
397 | hwif->drives[1].failures = 0; | ||
398 | break; | ||
399 | case BUSSTATE_OFF: | ||
400 | hwif->drives[0].failures = hwif->drives[0].max_failures + 1; | ||
401 | hwif->drives[1].failures = hwif->drives[1].max_failures + 1; | ||
402 | break; | ||
403 | case BUSSTATE_TRISTATE: | ||
404 | hwif->drives[0].failures = hwif->drives[0].max_failures + 1; | ||
405 | hwif->drives[1].failures = hwif->drives[1].max_failures + 1; | ||
406 | break; | ||
407 | default: | ||
408 | return -EINVAL; | ||
409 | } | ||
410 | hwif->bus_state = state; | ||
411 | return 0; | ||
412 | } | ||
413 | |||
414 | /** | ||
415 | * sil_sata_reset_poll - wait for SATA reset | 373 | * sil_sata_reset_poll - wait for SATA reset |
416 | * @drive: drive we are resetting | 374 | * @drive: drive we are resetting |
417 | * | 375 | * |
@@ -818,7 +776,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif) | |||
818 | if (sata) { | 776 | if (sata) { |
819 | static int first = 1; | 777 | static int first = 1; |
820 | 778 | ||
821 | hwif->busproc = &sil_sata_busproc; | ||
822 | hwif->reset_poll = &sil_sata_reset_poll; | 779 | hwif->reset_poll = &sil_sata_reset_poll; |
823 | hwif->pre_reset = &sil_sata_pre_reset; | 780 | hwif->pre_reset = &sil_sata_pre_reset; |
824 | hwif->udma_filter = &sil_sata_udma_filter; | 781 | hwif->udma_filter = &sil_sata_udma_filter; |