From e1009878163b1224397b3a109654b184c5f96cfc Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 4 Feb 2004 20:39:28 -0800 Subject: [PATCH] [PATCH] remove unused __ide_dma_retune() and ide_hwif_t->ide_dma_retune First introduced in kernel 2.3.99-pre3 (added to ide_dmaproc) and never used. --- drivers/ide/ide-dma.c | 18 ------------------ drivers/ide/ide.c | 1 - drivers/ide/pci/sgiioc4.c | 1 - drivers/ide/ppc/pmac.c | 1 - include/linux/ide.h | 3 --- 5 files changed, 24 deletions(-) diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 8864718ef308f..09c7b47a968f0 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -850,22 +850,6 @@ int __ide_dma_verbose (ide_drive_t *drive) EXPORT_SYMBOL(__ide_dma_verbose); -/** - * __ide_dma_retune - default retune handler - * @drive: drive to retune - * - * Default behaviour when we decide to return the IDE DMA setup. - * The default behaviour is "we don't" - */ - -int __ide_dma_retune (ide_drive_t *drive) -{ - printk(KERN_WARNING "%s: chipset supported call only\n", __FUNCTION__); - return 1; -} - -EXPORT_SYMBOL(__ide_dma_retune); - int __ide_dma_lostirq (ide_drive_t *drive) { printk("%s: DMA interrupt recovery\n", drive->name); @@ -1104,8 +1088,6 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p hwif->ide_dma_verbose = &__ide_dma_verbose; if (!hwif->ide_dma_timeout) hwif->ide_dma_timeout = &__ide_dma_timeout; - if (!hwif->ide_dma_retune) - hwif->ide_dma_retune = &__ide_dma_retune; if (!hwif->ide_dma_lostirq) hwif->ide_dma_lostirq = &__ide_dma_lostirq; diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 8f86f9e7fa2f4..031e2863d8940 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -846,7 +846,6 @@ void ide_unregister (unsigned int index) hwif->ide_dma_good_drive = old_hwif.ide_dma_good_drive; hwif->ide_dma_count = old_hwif.ide_dma_count; hwif->ide_dma_verbose = old_hwif.ide_dma_verbose; - hwif->ide_dma_retune = old_hwif.ide_dma_retune; hwif->ide_dma_lostirq = old_hwif.ide_dma_lostirq; hwif->ide_dma_timeout = old_hwif.ide_dma_timeout; hwif->ide_dma_queued_on = old_hwif.ide_dma_queued_on; diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 4d8332a9437f0..fe8d0888bd88e 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c @@ -653,7 +653,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif) hwif->ide_dma_good_drive = &__ide_dma_good_drive; hwif->ide_dma_count = &__ide_dma_count; hwif->ide_dma_verbose = &sgiioc4_ide_dma_verbose; - hwif->ide_dma_retune = &__ide_dma_retune; hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; hwif->ide_dma_timeout = &__ide_dma_timeout; hwif->INB = &sgiioc4_INB; diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 7810ebaf8dcda..60706f7471515 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -2029,7 +2029,6 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) hwif->ide_dma_bad_drive = &__ide_dma_bad_drive; hwif->ide_dma_verbose = &__ide_dma_verbose; hwif->ide_dma_timeout = &__ide_dma_timeout; - hwif->ide_dma_retune = &__ide_dma_retune; hwif->ide_dma_lostirq = &pmac_ide_dma_lostirq; hwif->ide_dma_queued_on = &__ide_dma_queued_on; hwif->ide_dma_queued_off = &__ide_dma_queued_off; diff --git a/include/linux/ide.h b/include/linux/ide.h index ac844eca377d6..98fe2db57d24d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -799,7 +799,6 @@ typedef struct ide_dma_ops_s { int (*ide_dma_good_drive)(ide_drive_t *drive); int (*ide_dma_count)(ide_drive_t *drive); int (*ide_dma_verbose)(ide_drive_t *drive); - int (*ide_dma_retune)(ide_drive_t *drive); int (*ide_dma_lostirq)(ide_drive_t *drive); int (*ide_dma_timeout)(ide_drive_t *drive); /* dma queued operations */ @@ -945,7 +944,6 @@ typedef struct hwif_s { int (*ide_dma_good_drive)(ide_drive_t *drive); int (*ide_dma_count)(ide_drive_t *drive); int (*ide_dma_verbose)(ide_drive_t *drive); - int (*ide_dma_retune)(ide_drive_t *drive); int (*ide_dma_lostirq)(ide_drive_t *drive); int (*ide_dma_timeout)(ide_drive_t *drive); @@ -1637,7 +1635,6 @@ extern int __ide_dma_bad_drive(ide_drive_t *); extern int __ide_dma_good_drive(ide_drive_t *); extern int __ide_dma_count(ide_drive_t *); extern int __ide_dma_verbose(ide_drive_t *); -extern int __ide_dma_retune(ide_drive_t *); extern int __ide_dma_lostirq(ide_drive_t *); extern int __ide_dma_timeout(ide_drive_t *); -- 2.53.0