The ahc driver should only have one devclass, not one for each bus

attachment.

Submitted by:	too many people to count
MFC after:	3 days

4 files changed, 10 insertions, 9 deletions

diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index c5451bd..10a0776 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -203,13 +203,11 @@ static device_method_t ahc_eisa_device_methods[] = {
 };
 
 static driver_t ahc_eisa_driver = {
-	"ahc_eisa",
+	"ahc",
 	ahc_eisa_device_methods,
 	sizeof(struct ahc_softc)
 };
 
-static devclass_t ahc_eisa_devclass;
-
-DRIVER_MODULE(ahc_eisa, eisa, ahc_eisa_driver, ahc_eisa_devclass, 0, 0);
+DRIVER_MODULE(ahc_eisa, eisa, ahc_eisa_driver, ahc_devclass, 0, 0);
 MODULE_DEPEND(ahc_eisa, ahc, 1, 1, 1);
 MODULE_VERSION(ahc_eisa, 1);
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 0ea4cc1..c5e6983 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -50,15 +50,13 @@ static device_method_t ahc_pci_device_methods[] = {
 };
 
 static driver_t ahc_pci_driver = {
-	"ahc_pci",
+	"ahc",
 	ahc_pci_device_methods,
 	sizeof(struct ahc_softc)
 };
 
-static devclass_t ahc_pci_devclass;
-
-DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_pci_devclass, 0, 0);
-DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_pci_devclass, 0, 0);
+DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_devclass, 0, 0);
+DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_devclass, 0, 0);
 MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1);
 MODULE_VERSION(ahc_pci, 1);
 
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index 42dc9aa..99674d1 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -42,6 +42,8 @@
 
 #define ccb_scb_ptr spriv_ptr0
 
+devclass_t ahc_devclass;
+
 #if UNUSED
 static void	ahc_dump_targcmd(struct target_cmd *cmd);
 #endif
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 3456e99..171c10b 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -88,6 +88,9 @@
 #define AHC_NEW_TRAN_SETTINGS
 #endif /* CAM_NEW_TRAN_CODE */
 
+/*************************** Attachment Bookkeeping ***************************/
+extern devclass_t ahc_devclass;
+
 /****************************** Platform Macros *******************************/
 #define	SIM_IS_SCSIBUS_B(ahc, sim)	\
 	((sim) == ahc->platform_data->sim_b)