summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-sh7760.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
commitb675b3667f6729dcd1036a2a129b35445947f905 (patch)
tree0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/i2c/busses/i2c-sh7760.c
parentInput: max8925_onkey - avoid accessing input device too early (diff)
parentLinux 3.3-rc6 (diff)
downloadlinux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz
linux-b675b3667f6729dcd1036a2a129b35445947f905.zip
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/i2c/busses/i2c-sh7760.c')
-rw-r--r--drivers/i2c/busses/i2c-sh7760.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index a67132b2e092..c0c9dffbdb12 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -560,18 +560,7 @@ static struct platform_driver sh7760_i2c_drv = {
.remove = __devexit_p(sh7760_i2c_remove),
};
-static int __init sh7760_i2c_init(void)
-{
- return platform_driver_register(&sh7760_i2c_drv);
-}
-
-static void __exit sh7760_i2c_exit(void)
-{
- platform_driver_unregister(&sh7760_i2c_drv);
-}
-
-module_init(sh7760_i2c_init);
-module_exit(sh7760_i2c_exit);
+module_platform_driver(sh7760_i2c_drv);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SH7760 I2C bus driver");