Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>2004-02-15 21:46:53 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2004-02-15 21:46:53 -0800
commit6e14119e8beff9bf947c003cee0d9b8b0429a9d9 (patch)
tree06ba1717044f877e5641cf4f6b72425443fbadf4
parent1e99d97a0ad41992c62f476c632019222be76d8f (diff)
[PATCH] remove ide_dma_{good,bad}_drive from ide_hwif_t
Use __ide_dma_{good,bad}_drive() directly and remove these wrappers.
-rw-r--r--drivers/ide/ide-dma.c8
-rw-r--r--drivers/ide/ide.c2
-rw-r--r--drivers/ide/pci/aec62xx.c4
-rw-r--r--drivers/ide/pci/alim15x3.c4
-rw-r--r--drivers/ide/pci/cmd64x.c4
-rw-r--r--drivers/ide/pci/cs5530.c4
-rw-r--r--drivers/ide/pci/hpt34x.c4
-rw-r--r--drivers/ide/pci/hpt366.c4
-rw-r--r--drivers/ide/pci/it8172.c4
-rw-r--r--drivers/ide/pci/pdc202xx_new.c4
-rw-r--r--drivers/ide/pci/pdc202xx_old.c4
-rw-r--r--drivers/ide/pci/piix.c4
-rw-r--r--drivers/ide/pci/sc1200.c6
-rw-r--r--drivers/ide/pci/serverworks.c4
-rw-r--r--drivers/ide/pci/sgiioc4.c2
-rw-r--r--drivers/ide/pci/siimage.c4
-rw-r--r--drivers/ide/pci/sis5513.c4
-rw-r--r--drivers/ide/pci/sl82c105.c4
-rw-r--r--drivers/ide/pci/slc90e66.c4
-rw-r--r--drivers/ide/pci/triflex.c2
-rw-r--r--drivers/ide/ppc/pmac.c2
-rw-r--r--include/linux/ide.h4
22 files changed, 36 insertions, 50 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 205c28225ad9..b934574f2f8e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -413,7 +413,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
if ((id->capability & 1) && hwif->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
return hwif->ide_dma_off(drive);
/*
@@ -432,7 +432,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
return hwif->ide_dma_on(drive);
/* Consult the list of known "good" drives */
- if (hwif->ide_dma_good_drive(drive))
+ if (__ide_dma_good_drive(drive))
return hwif->ide_dma_on(drive);
}
// if (hwif->tuneproc != NULL) hwif->tuneproc(drive, 255);
@@ -1084,10 +1084,6 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
hwif->ide_dma_end = &__ide_dma_end;
if (!hwif->ide_dma_test_irq)
hwif->ide_dma_test_irq = &__ide_dma_test_irq;
- if (!hwif->ide_dma_bad_drive)
- hwif->ide_dma_bad_drive = &__ide_dma_bad_drive;
- if (!hwif->ide_dma_good_drive)
- hwif->ide_dma_good_drive = &__ide_dma_good_drive;
if (!hwif->ide_dma_verbose)
hwif->ide_dma_verbose = &__ide_dma_verbose;
if (!hwif->ide_dma_timeout)
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index bdad8f873bc8..7dee5ae9d2ac 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -844,8 +844,6 @@ void ide_unregister (unsigned int index)
hwif->ide_dma_test_irq = old_hwif.ide_dma_test_irq;
hwif->ide_dma_host_on = old_hwif.ide_dma_host_on;
hwif->ide_dma_host_off = old_hwif.ide_dma_host_off;
- hwif->ide_dma_bad_drive = old_hwif.ide_dma_bad_drive;
- 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_lostirq = old_hwif.ide_dma_lostirq;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 8e45b971e6fb..1424481d5d5f 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -330,7 +330,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
if ((id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -347,7 +347,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 73398a1b3896..1a81d86d5b18 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -516,7 +516,7 @@ static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
if ((id != NULL) && ((id->capability & 1) != 0) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto ata_pio;
if ((id->field_valid & 4) && (m5229_revision >= 0xC2)) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -533,7 +533,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index f342a2812628..d70d050c7000 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -459,7 +459,7 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
if ((id != NULL) && ((id->capability & 1) != 0) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if ((id->field_valid & 4) && cmd64x_ratemask(drive)) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -476,7 +476,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index bf0e61436af3..d37c778539da 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -180,7 +180,7 @@ static int cs5530_config_dma (ide_drive_t *drive)
if (mate->present) {
struct hd_driveid *mateid = mate->id;
if (mateid && (mateid->capability & 1) &&
- !hwif->ide_dma_bad_drive(mate)) {
+ !__ide_dma_bad_drive(mate)) {
if ((mateid->field_valid & 4) &&
(mateid->dma_ultra & 7))
udma_ok = 1;
@@ -197,7 +197,7 @@ static int cs5530_config_dma (ide_drive_t *drive)
* selecting UDMA only if the mate said it was ok.
*/
if (id && (id->capability & 1) && drive->autodma &&
- !hwif->ide_dma_bad_drive(drive)) {
+ !__ide_dma_bad_drive(drive)) {
if (udma_ok && (id->field_valid & 4) && (id->dma_ultra & 7)) {
if (id->dma_ultra & 4)
mode = XFER_UDMA_2;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 8ce180be939c..e03b0061ed52 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -190,7 +190,7 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -207,7 +207,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 6cbc1135dbc4..b1adf40769ad 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -514,7 +514,7 @@ static int hpt366_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -530,7 +530,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
index 91d511be265d..f79a357b2c56 100644
--- a/drivers/ide/pci/it8172.c
+++ b/drivers/ide/pci/it8172.c
@@ -202,7 +202,7 @@ static int it8172_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -219,7 +219,7 @@ try_dma_modes:
if (!it8172_config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!it8172_config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 3f1535d873cf..42fc7d07a79a 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -393,7 +393,7 @@ static int pdcnew_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -410,7 +410,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
goto no_dma_set;
/* Consult the list of known "good" drives */
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index b468806c0848..36905608008d 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -482,7 +482,7 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -499,7 +499,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
goto no_dma_set;
/* Consult the list of known "good" drives */
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 7c578167475a..7f34d0b6baa6 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -563,7 +563,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
if ((id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -580,7 +580,7 @@ try_dma_modes:
if (!piix_config_drive_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!piix_config_drive_for_dma(drive))
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 4c2218784b14..9f2ff6e57d57 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -164,7 +164,7 @@ static int sc1200_autoselect_dma_mode (ide_drive_t *drive)
*/
if (mate->present) {
struct hd_driveid *mateid = mate->id;
- if (mateid && (mateid->capability & 1) && !hwif->ide_dma_bad_drive(mate)) {
+ if (mateid && (mateid->capability & 1) && !__ide_dma_bad_drive(mate)) {
if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
udma_ok = 1;
else if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
@@ -177,7 +177,7 @@ static int sc1200_autoselect_dma_mode (ide_drive_t *drive)
* Now see what the current drive is capable of,
* selecting UDMA only if the mate said it was ok.
*/
- if (id && (id->capability & 1) && hwif->autodma && !hwif->ide_dma_bad_drive(drive)) {
+ if (id && (id->capability & 1) && hwif->autodma && !__ide_dma_bad_drive(drive)) {
if (udma_ok && (id->field_valid & 4) && (id->dma_ultra & 7)) {
if (id->dma_ultra & 4)
mode = XFER_UDMA_2;
@@ -493,7 +493,7 @@ printk("%s: SC1200: resume\n", hwif->name);
//
for (d = 0; d < MAX_DRIVES; ++d) {
ide_drive_t *drive = &(hwif->drives[d]);
- if (drive->present && !hwif->ide_dma_bad_drive(drive)) {
+ if (drive->present && !__ide_dma_bad_drive(drive)) {
int was_using_dma = drive->using_dma;
hwif->ide_dma_off_quietly(drive);
sc1200_config_dma(drive);
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index fa9fe55c8041..0409b25c1d52 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -464,7 +464,7 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
if ((id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -481,7 +481,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 550e505d75c0..9579b225a3b3 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -649,8 +649,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on;
hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off;
- hwif->ide_dma_bad_drive = &__ide_dma_bad_drive;
- 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_lostirq = &sgiioc4_ide_dma_lostirq;
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 0202611ed6ba..74521e43d6a0 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -490,7 +490,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
if ((id->capability & 1) != 0 && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if ((id->field_valid & 4) && siimage_ratemask(drive)) {
@@ -508,7 +508,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index d8a810820fb7..bc719cdfe924 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -671,7 +671,7 @@ static int sis5513_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
if (id->dma_ultra & hwif->ultra_mask) {
@@ -688,7 +688,7 @@ try_dma_modes:
if (!config_chipset_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!config_chipset_for_dma(drive))
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 1c721c5a5c85..6fa7df358617 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -158,7 +158,7 @@ static int sl82c105_check_drive (ide_drive_t *drive)
break;
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
break;
if (id->field_valid & 2) {
@@ -167,7 +167,7 @@ static int sl82c105_check_drive (ide_drive_t *drive)
return hwif->ide_dma_on(drive);
}
- if (hwif->ide_dma_good_drive(drive))
+ if (__ide_dma_good_drive(drive))
return hwif->ide_dma_on(drive);
} while (0);
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 11d07eaa0583..f3d11cb09c1e 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -275,7 +275,7 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
if (id && (id->capability & 1) && drive->autodma) {
/* Consult the list of known "bad" drives */
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto fast_ata_pio;
if (id->field_valid & 4) {
@@ -293,7 +293,7 @@ try_dma_modes:
if (!slc90e66_config_drive_for_dma(drive))
goto no_dma_set;
}
- } else if (hwif->ide_dma_good_drive(drive) &&
+ } else if (__ide_dma_good_drive(drive) &&
(id->eide_dma_time < 150)) {
/* Consult the list of known "good" drives */
if (!slc90e66_config_drive_for_dma(drive))
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 471ed5e12a45..92acfbc1f1b9 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -173,7 +173,7 @@ static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
struct hd_driveid *id = drive->id;
if (id && (id->capability & 1) && drive->autodma) {
- if (hwif->ide_dma_bad_drive(drive))
+ if (__ide_dma_bad_drive(drive))
goto tune_pio;
if (id->field_valid & 2) {
if ((id->dma_mword & hwif->mwdma_mask) ||
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index f974a556b462..43d93b527a6d 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -2171,8 +2171,6 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq;
hwif->ide_dma_host_off = &pmac_ide_dma_host_off;
hwif->ide_dma_host_on = &pmac_ide_dma_host_on;
- hwif->ide_dma_good_drive = &__ide_dma_good_drive;
- 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_lostirq = &pmac_ide_dma_lostirq;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 1533e9ab256e..1c75a4f3c8b6 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -795,8 +795,6 @@ typedef struct ide_dma_ops_s {
int (*ide_dma_test_irq)(ide_drive_t *drive);
int (*ide_dma_host_on)(ide_drive_t *drive);
int (*ide_dma_host_off)(ide_drive_t *drive);
- int (*ide_dma_bad_drive)(ide_drive_t *drive);
- 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_lostirq)(ide_drive_t *drive);
@@ -934,8 +932,6 @@ typedef struct hwif_s {
int (*ide_dma_test_irq)(ide_drive_t *drive);
int (*ide_dma_host_on)(ide_drive_t *drive);
int (*ide_dma_host_off)(ide_drive_t *drive);
- int (*ide_dma_bad_drive)(ide_drive_t *drive);
- 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_lostirq)(ide_drive_t *drive);