Catch up with ATA-mkIII

2 files changed, 2 insertions, 36 deletions

diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index d25a3af7aea9..c74b5794b530 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -89,20 +89,7 @@ static driver_t ata_kauai_driver = {
 };
 
 DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, 0, 0);
-
-static int
-ata_kauai_locknoop(struct ata_channel *ch, int type)
-{
-	/* XXX SMP ? */
-	return (0);
-}
-
-static void
-ata_kauai_setmode(struct ata_device *atadev, int mode)
-{
-	atadev->mode = ATA_PIO;
-}
-
+MODULE_DEPEND(ata, ata, 1, 1, 1);
 
 /*
  * PCI ID search table
@@ -191,9 +178,6 @@ ata_kauai_probe(device_t dev)
 
         ch->unit = 0;
         ch->flags |= ATA_USE_16BIT|ATA_NO_SLAVE;
-        ch->locking = ata_kauai_locknoop;
-        ch->device[MASTER].setmode = ata_kauai_setmode;
-        ch->device[SLAVE].setmode = ata_kauai_setmode;
 	ata_generic_hw(ch);
 
         return (ata_probe(dev));
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index dde93a05561a..9be839976d5c 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -79,22 +79,7 @@ static driver_t ata_macio_driver = {
 };
 
 DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, 0, 0);
-
-static int
-ata_macio_locknoop(struct ata_channel *ch, int type)
-{
-
-	return (ch->unit);
-}
-
-static void
-ata_macio_setmode(struct ata_device *atadev, int mode)
-{
-#if 0
-	atadev->mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX);
-#endif
-	atadev->mode = ATA_PIO;
-}
+MODULE_DEPEND(ata, ata, 1, 1, 1);
 
 static int
 ata_macio_probe(device_t dev)
@@ -130,9 +115,6 @@ ata_macio_probe(device_t dev)
 
 	ch->unit = 0;
 	ch->flags |= ATA_USE_16BIT;
-	ch->locking = ata_macio_locknoop;
-	ch->device[MASTER].setmode = ata_macio_setmode;
-	ch->device[SLAVE].setmode = ata_macio_setmode;
 	ata_generic_hw(ch);
 
 	return (ata_probe(dev));