Re: [PATCH] PCI fixes for 2.6.9

[Greg KH]

ChangeSet 1.1997.37.63, 2004/10/06 14:08:45-07:00, greg@xxxxxxxxx

[PATCH] PCI: remove pci_module_init() usage from drivers/usb/*

Signed-off-by: Greg Kroah-Hartman <greg@xxxxxxxxx>


 drivers/usb/gadget/goku_udc.c |    2 +-
 drivers/usb/gadget/net2280.c  |    2 +-
 drivers/usb/host/ehci-hcd.c   |    2 +-
 drivers/usb/host/ohci-pci.c   |    2 +-
 drivers/usb/host/uhci-hcd.c   |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


diff -Nru a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
--- a/drivers/usb/gadget/goku_udc.c	2004-10-19 15:21:42 -07:00
+++ b/drivers/usb/gadget/goku_udc.c	2004-10-19 15:21:42 -07:00
@@ -1976,7 +1976,7 @@
 
 static int __init init (void)
 {
-	return pci_module_init (&goku_pci_driver);
+	return pci_register_driver (&goku_pci_driver);
 }
 module_init (init);
 
diff -Nru a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
--- a/drivers/usb/gadget/net2280.c	2004-10-19 15:21:41 -07:00
+++ b/drivers/usb/gadget/net2280.c	2004-10-19 15:21:41 -07:00
@@ -2935,7 +2935,7 @@
 {
 	if (!use_dma)
 		use_dma_chaining = 0;
-	return pci_module_init (&net2280_pci_driver);
+	return pci_register_driver (&net2280_pci_driver);
 }
 module_init (init);
 
diff -Nru a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/host/ehci-hcd.c	2004-10-19 15:21:42 -07:00
+++ b/drivers/usb/host/ehci-hcd.c	2004-10-19 15:21:42 -07:00
@@ -1092,7 +1092,7 @@
 		sizeof (struct ehci_qh), sizeof (struct ehci_qtd),
 		sizeof (struct ehci_itd), sizeof (struct ehci_sitd));
 
-	return pci_module_init (&ehci_pci_driver);
+	return pci_register_driver (&ehci_pci_driver);
 }
 module_init (init);
 
diff -Nru a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
--- a/drivers/usb/host/ohci-pci.c	2004-10-19 15:21:42 -07:00
+++ b/drivers/usb/host/ohci-pci.c	2004-10-19 15:21:42 -07:00
@@ -279,7 +279,7 @@
 
 	pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
 		sizeof (struct ed), sizeof (struct td));
-	return pci_module_init (&ohci_pci_driver);
+	return pci_register_driver (&ohci_pci_driver);
 }
 module_init (ohci_hcd_pci_init);
 
diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c	2004-10-19 15:21:42 -07:00
+++ b/drivers/usb/host/uhci-hcd.c	2004-10-19 15:21:42 -07:00
@@ -2534,7 +2534,7 @@
 	if (!uhci_up_cachep)
 		goto up_failed;
 
-	retval = pci_module_init(&uhci_pci_driver);
+	retval = pci_register_driver(&uhci_pci_driver);
 	if (retval)
 		goto init_failed;
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/