summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/muxes/pca954x.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-04-12 19:49:28 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 19:49:28 +0200
commit8065248069097dddf9945acfb2081025e9618c16 (patch)
treeeddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/i2c/muxes/pca954x.c
parentrt2x00: do not generate seqno in h/w if QOS is disabled (diff)
parentNFC: Fix the LLCP Tx fragmentation loop (diff)
downloadlinux-8065248069097dddf9945acfb2081025e9618c16.tar.xz
linux-8065248069097dddf9945acfb2081025e9618c16.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/i2c/muxes/pca954x.c')
-rw-r--r--drivers/i2c/muxes/pca954x.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 6f8953664636..0e37ef27aa12 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -284,18 +284,7 @@ static struct i2c_driver pca954x_driver = {
.id_table = pca954x_id,
};
-static int __init pca954x_init(void)
-{
- return i2c_add_driver(&pca954x_driver);
-}
-
-static void __exit pca954x_exit(void)
-{
- i2c_del_driver(&pca954x_driver);
-}
-
-module_init(pca954x_init);
-module_exit(pca954x_exit);
+module_i2c_driver(pca954x_driver);
MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
MODULE_DESCRIPTION("PCA954x I2C mux/switch driver");