[09/10] ipmi: kcs_bmc: Add module_kcs_bmc_driver()
Commit Message
Remove some cruft in the client modules by adding the usual module macro
for the KCS subsystem.
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
drivers/char/ipmi/kcs_bmc.c | 4 +++-
drivers/char/ipmi/kcs_bmc.h | 1 +
drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 15 +--------------
drivers/char/ipmi/kcs_bmc_client.h | 7 ++++++-
drivers/char/ipmi/kcs_bmc_serio.c | 15 +--------------
5 files changed, 12 insertions(+), 30 deletions(-)
@@ -174,7 +174,7 @@ void kcs_bmc_remove_device(struct kcs_bmc_device *dev)
}
EXPORT_SYMBOL(kcs_bmc_remove_device);
-void kcs_bmc_register_driver(struct kcs_bmc_driver *drv)
+int kcs_bmc_register_driver(struct kcs_bmc_driver *drv)
{
struct kcs_bmc_client *client;
struct kcs_bmc_device *dev;
@@ -191,6 +191,8 @@ void kcs_bmc_register_driver(struct kcs_bmc_driver *drv)
list_add(&client->entry, &kcs_bmc_clients);
}
mutex_unlock(&kcs_bmc_lock);
+
+ return 0;
}
EXPORT_SYMBOL(kcs_bmc_register_driver);
@@ -7,6 +7,7 @@
#define __KCS_BMC_H__
#include <linux/list.h>
+#include <linux/module.h>
#include <linux/spinlock.h>
#define KCS_BMC_EVENT_TYPE_OBE BIT(0)
@@ -523,20 +523,7 @@ static struct kcs_bmc_driver kcs_bmc_ipmi_driver = {
.ops = &kcs_bmc_ipmi_driver_ops,
};
-static int __init kcs_bmc_ipmi_init(void)
-{
- kcs_bmc_register_driver(&kcs_bmc_ipmi_driver);
-
- return 0;
-}
-module_init(kcs_bmc_ipmi_init);
-
-static void __exit kcs_bmc_ipmi_exit(void)
-{
- kcs_bmc_unregister_driver(&kcs_bmc_ipmi_driver);
-}
-module_exit(kcs_bmc_ipmi_exit);
-
+module_kcs_bmc_driver(kcs_bmc_ipmi_driver);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Haiyue Wang <haiyue.wang@linux.intel.com>");
MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
@@ -5,6 +5,7 @@
#define __KCS_BMC_CONSUMER_H__
#include <linux/irqreturn.h>
+#include <linux/module.h>
#include "kcs_bmc.h"
@@ -44,9 +45,13 @@ struct kcs_bmc_driver {
const struct kcs_bmc_driver_ops *ops;
};
-void kcs_bmc_register_driver(struct kcs_bmc_driver *drv);
+int kcs_bmc_register_driver(struct kcs_bmc_driver *drv);
void kcs_bmc_unregister_driver(struct kcs_bmc_driver *drv);
+#define module_kcs_bmc_driver(__kcs_bmc_driver) \
+ module_driver(__kcs_bmc_driver, kcs_bmc_register_driver, \
+ kcs_bmc_unregister_driver)
+
int kcs_bmc_enable_device(struct kcs_bmc_client *client);
void kcs_bmc_disable_device(struct kcs_bmc_client *client);
u8 kcs_bmc_read_data(struct kcs_bmc_client *client);
@@ -123,20 +123,7 @@ static struct kcs_bmc_driver kcs_bmc_serio_driver = {
.ops = &kcs_bmc_serio_driver_ops,
};
-static int __init kcs_bmc_serio_init(void)
-{
- kcs_bmc_register_driver(&kcs_bmc_serio_driver);
-
- return 0;
-}
-module_init(kcs_bmc_serio_init);
-
-static void __exit kcs_bmc_serio_exit(void)
-{
- kcs_bmc_unregister_driver(&kcs_bmc_serio_driver);
-}
-module_exit(kcs_bmc_serio_exit);
-
+module_kcs_bmc_driver(kcs_bmc_serio_driver);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
MODULE_DESCRIPTION("Adapter driver for serio access to BMC KCS devices");