Skip to contentSkip to conversation

i2c: i801: simplify module boilerplate code

PATCH Applied Heiner Kallweit 4 participants 4 messages Sep 18, 2023 – Sep 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: i801: simplify module boilerplate code

Simplify the module boilerplate code.

---
 drivers/i2c/busses/i2c-i801.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-i801.c +3 -9
index 811541797..6d02a8b88 100644
@@ -1847,16 +1847,11 @@ static struct pci_driver i801_driver = {
 	},
 };
 
-static int __init i2c_i801_init(void)
+static int __init i2c_i801_init(struct pci_driver *drv)
 {
 	if (dmi_name_in_vendors("FUJITSU"))
 		input_apanel_init();
-	return pci_register_driver(&i801_driver);
-}
-
-static void __exit i2c_i801_exit(void)
-{
-	pci_unregister_driver(&i801_driver);
+	return pci_register_driver(drv);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <[email protected]>");
@@ -1864,5 +1859,4 @@ MODULE_AUTHOR("Jean Delvare <[email protected]>");
 MODULE_DESCRIPTION("I801 SMBus driver");
 MODULE_LICENSE("GPL");
 
-module_init(i2c_i801_init);
-module_exit(i2c_i801_exit);
+module_driver(i801_driver, i2c_i801_init, pci_unregister_driver);
Signature · 1 line
2.42.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 31 lines · Heiner Kallweit

Simplify the module boilerplate code.

---
 drivers/i2c/busses/i2c-i801.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-i801.c +2 -7
index 811541797..6d02a8b88 100644
@@ -1847,16 +1847,11 @@ static struct pci_driver i801_driver = {
 	},
 };
 
-static int __init i2c_i801_init(void)
+static int __init i2c_i801_init(struct pci_driver *drv)
 {
 	if (dmi_name_in_vendors("FUJITSU"))
 		input_apanel_init();
-	return pci_register_driver(&i801_driver);
-}
-
-static void __exit i2c_i801_exit(void)
-{
-	pci_unregister_driver(&i801_driver);
+	return pci_register_driver(drv);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <[email protected]>");

drivers/i2c/busses/i2c-i801.c MODULE_AUTHOR("Jean Delvare <[email protected]>"); · line 1862

Quoted 6 lines
drivers/i2c/busses/i2c-i801.c +1 -2
@@ -1864,5 +1859,4 @@ MODULE_AUTHOR("Jean Delvare <[email protected]>");
 MODULE_DESCRIPTION("I801 SMBus driver");
 MODULE_LICENSE("GPL");
 
-module_init(i2c_i801_init);
-module_exit(i2c_i801_exit);
+module_driver(i801_driver, i2c_i801_init, pci_unregister_driver);

Thanks,

Signature · 2 lines
Jean Delvare
SUSE L3 Support