diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 18:15:18 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 18:15:18 (GMT) |
| commit | 9f9d2760da8c7f94fae119fac3e13d5a1702f8f0 (patch) | |
| tree | e244a2969edceff750478e7d98355b76ef30aa0f /drivers/misc/ics932s401.c | |
| parent | ad2a8e6078a16d3b61b530f1447110841c36ae56 (diff) | |
| parent | b222258ac11cae3e0350fe5992ad164a7b128103 (diff) | |
| download | linux-9f9d2760da8c7f94fae119fac3e13d5a1702f8f0.tar.xz | |
Merge tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char and misc patches for 3.4-rc1 from Greg KH:
"Not much here, just a few minor fixes and some conversions to the
module_*_driver() functions, making the codebase smaller."
* tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: bmp085: Use unsigned long to store jiffies
char/ramoops: included linux/err.h twice
misc: bmp085: Handle jiffies overflow correctly
misc: fsa9480: Remove obsolete cleanup for clientdata
char: Fix typo in tlclk.c
char: Fix typo in viotape.c
cs5535-mfgpt: don't call __init function from __devinit
MISC: convert drivers/misc/* to use module_spi_driver()
MISC: convert drivers/misc/* to use module_i2c_driver()
MISC: convert drivers/misc/* to use module_platform_driver()
Diffstat (limited to 'drivers/misc/ics932s401.c')
| -rw-r--r-- | drivers/misc/ics932s401.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c index 152e9d9..0029536 100644 --- a/drivers/misc/ics932s401.c +++ b/drivers/misc/ics932s401.c @@ -480,23 +480,12 @@ static int ics932s401_remove(struct i2c_client *client) return 0; } -static int __init ics932s401_init(void) -{ - return i2c_add_driver(&ics932s401_driver); -} - -static void __exit ics932s401_exit(void) -{ - i2c_del_driver(&ics932s401_driver); -} +module_i2c_driver(ics932s401_driver); MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>"); MODULE_DESCRIPTION("ICS932S401 driver"); MODULE_LICENSE("GPL"); -module_init(ics932s401_init); -module_exit(ics932s401_exit); - /* IBM IntelliStation Z30 */ MODULE_ALIAS("dmi:bvnIBM:*:rn9228:*"); MODULE_ALIAS("dmi:bvnIBM:*:rn9232:*"); |