- Make pcib_devclass private to sys/dev/pci/pci_pci.c and change all the

  various pcib drivers to use their own private devclass_t variables for
  their modules.
- Use the DEFINE_CLASS_0() macro to declare drivers for the various pcib
  drivers while I'm here.

2 files changed, 5 insertions, 10 deletions

diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c
index 0e743b4..58ec72c 100644
--- a/sys/sparc64/pci/apb.c
+++ b/sys/sparc64/pci/apb.c
@@ -112,12 +112,9 @@ static device_method_t apb_methods[] = {
 	{ 0, 0 }
 };
 
-static driver_t apb_driver = {
-	"pcib",
-	apb_methods,
-	sizeof(struct apb_softc),
-};
+static devclass_t pcib_devclass;
 
+DEFINE_CLASS_0(pcib, apb_driver, apb_methods, sizeof(struct apb_softc));
 DRIVER_MODULE(apb, pci, apb_driver, pcib_devclass, 0, 0);
 
 /* APB specific registers */
diff --git a/sys/sparc64/pci/ofw_pcib.c b/sys/sparc64/pci/ofw_pcib.c
index 0f10696..d4e627d 100644
--- a/sys/sparc64/pci/ofw_pcib.c
+++ b/sys/sparc64/pci/ofw_pcib.c
@@ -93,12 +93,10 @@ static device_method_t ofw_pcib_methods[] = {
 	{ 0, 0 }
 };
 
-static driver_t ofw_pcib_driver = {
-	"pcib",
-	ofw_pcib_methods,
-	sizeof(struct ofw_pcib_gen_softc),
-};
+static devclass_t pcib_devclass;
 
+DEFINE_CLASS_0(pcib, ofw_pcib_driver, ofw_pcib_methods,
+    sizeof(struct ofw_pcib_gen_softc));
 DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_driver, pcib_devclass, 0, 0);
 
 static int