summaryrefslogtreecommitdiffstats
path: root/sys/dev/ida
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-11-08 07:56:10 +0000
committerpeter <peter@FreeBSD.org>1999-11-08 07:56:10 +0000
commit3d459b4aed8f8dd70f0e56424218376c15e5be81 (patch)
treec3b42e623d7a6c20cd6019ab4a509b18727c7b0b /sys/dev/ida
parent5b37dfdd4b8439c42b56ed180785cfe9998d99a3 (diff)
downloadFreeBSD-src-3d459b4aed8f8dd70f0e56424218376c15e5be81.zip
FreeBSD-src-3d459b4aed8f8dd70f0e56424218376c15e5be81.tar.gz
Call id_drvinit() from attach, not probe as the OS hasn't necessarily
decided which driver to use until attach. Use DRIVER_MODULE().
Diffstat (limited to 'sys/dev/ida')
-rw-r--r--sys/dev/ida/ida_disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index bca8abf..294b85b 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -272,7 +272,6 @@ static int
idprobe(device_t dev)
{
- id_drvinit();
device_set_desc(dev, "Compaq Logical Drive");
return (0);
}
@@ -285,6 +284,7 @@ idattach(device_t dev)
device_t parent;
int error;
+ id_drvinit();
drv = (struct id_softc *)device_get_softc(dev);
parent = device_get_parent(dev);
drv->controller = (struct ida_softc *)device_get_softc(parent);
@@ -317,4 +317,4 @@ idattach(device_t dev)
return (0);
}
-DEV_DRIVER_MODULE(id, ida, id_driver, id_devclass, id_cdevsw, 0, 0);
+DRIVER_MODULE(id, ida, id_driver, id_devclass, 0, 0);
OpenPOWER on IntegriCloud