Skip to contentSkip to conversation

Switch to pci_register_driver

PATCH In review Jan Kiszka 3 participants 4 messages Jun 19, 2007 – Jun 21, 2007

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 Switch to pci_register_driver

Hi Wolfgang,

can we just switch over to pci_register_driver in order to avoid deprecated (and soon removed) pci_module_init? Or do we also need some wrapper for older 2.4 kernels (latest 2.4 is already aligned with 2.6)?

Jan

drivers/can/sja1000/rtcan_ixxat_pci.c +1 -1
Index: ksrc/drivers/can/sja1000/rtcan_ixxat_pci.c
===================================================================
@@ -307,7 +307,7 @@ static struct pci_driver rtcan_ixxat_pci
 
 static int __init rtcan_ixxat_pci_init(void)
 {
-    return pci_module_init(&rtcan_ixxat_pci_driver);
+    return pci_register_driver(&rtcan_ixxat_pci_driver);
 }
drivers/can/sja1000/rtcan_peak_pci.c +1 -1
Index: ksrc/drivers/can/sja1000/rtcan_peak_pci.c
===================================================================
@@ -346,7 +346,7 @@ static struct pci_driver rtcan_peak_pci_
 
 static int __init rtcan_peak_pci_init(void)
 {
-    return pci_module_init(&rtcan_peak_pci_driver);
+    return pci_register_driver(&rtcan_peak_pci_driver);
 }
#1 lore raw
Quoted 5 lines · Jan Kiszka

Hi Wolfgang,

can we just switch over to pci_register_driver in order to avoid deprecated (and soon removed) pci_module_init? Or do we also need some wrapper for older 2.4 kernels (latest 2.4 is already aligned with 2.6)?

Likely. I will do some tests tomorrow.

Wolfgang.

#2 lore raw
In reply to Jan Kiszka

Hi Jan,

Quoted 5 lines · Jan Kiszka

Hi Wolfgang,

can we just switch over to pci_register_driver in order to avoid deprecated (and soon removed) pci_module_init? Or do we also need some wrapper for older 2.4 kernels (latest 2.4 is already aligned with 2.6)?

It works with 2.4.25, at least and from my point of view it can be applied.

Thanks.

Wolfgang.

Quoted 30 lines

Jan

Index: ksrc/drivers/can/sja1000/rtcan_ixxat_pci.c
===================================================================

drivers/can/sja1000/rtcan_ixxat_pci.c +1 -1
@@ -307,7 +307,7 @@ static struct pci_driver rtcan_ixxat_pci
 
 static int __init rtcan_ixxat_pci_init(void)
 {
-    return pci_module_init(&rtcan_ixxat_pci_driver);
+    return pci_register_driver(&rtcan_ixxat_pci_driver);
 }

Index: ksrc/drivers/can/sja1000/rtcan_peak_pci.c
===================================================================

drivers/can/sja1000/rtcan_peak_pci.c +1 -1
@@ -346,7 +346,7 @@ static struct pci_driver rtcan_peak_pci_
 
 static int __init rtcan_peak_pci_init(void)
 {
-    return pci_module_init(&rtcan_peak_pci_driver);
+    return pci_register_driver(&rtcan_peak_pci_driver);
 }
#3 lore raw
Quoted 11 lines · Wolfgang Grandegger

Hi Jan,

Quoted 5 lines · Jan Kiszka

Hi Wolfgang,

can we just switch over to pci_register_driver in order to avoid deprecated (and soon removed) pci_module_init? Or do we also need some wrapper for older 2.4 kernels (latest 2.4 is already aligned with 2.6)?

It works with 2.4.25, at least and from my point of view it can be applied.

Ok, so that's fine with me too. Please apply.

Quoted 40 lines

Thanks.

Wolfgang.

Quoted 22 lines

Jan

Index: ksrc/drivers/can/sja1000/rtcan_ixxat_pci.c
===================================================================

drivers/can/sja1000/rtcan_ixxat_pci.c +1 -1
@@ -307,7 +307,7 @@ static struct pci_driver rtcan_ixxat_pci
 
 static int __init rtcan_ixxat_pci_init(void)
 {
-    return pci_module_init(&rtcan_ixxat_pci_driver);
+    return pci_register_driver(&rtcan_ixxat_pci_driver);
 }

Index: ksrc/drivers/can/sja1000/rtcan_peak_pci.c
===================================================================

drivers/can/sja1000/rtcan_peak_pci.c static struct pci_driver rtcan_peak_pci_ · line 352

Quoted 8 lines
drivers/can/sja1000/rtcan_peak_pci.c +1 -1
@@ -346,7 +346,7 @@ static struct pci_driver rtcan_peak_pci_
 
 static int __init rtcan_peak_pci_init(void)
 {
-    return pci_module_init(&rtcan_peak_pci_driver);
+    return pci_register_driver(&rtcan_peak_pci_driver);
 }

_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core

Signature · 1 line
Philippe.