diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-20 16:35:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 16:35:21 -0700 |
| commit | 928487a1ceca5cd7e41bd78fa4a10098d8cc1ca9 (patch) | |
| tree | 98ffaef4e16a6784520a31ed61a8706dc247dd10 /arch/arm/mach-s3c24xx/h1940-bluetooth.c | |
| parent | 2203747c97712975accc5e69bdaf1ad38a691635 (diff) | |
| parent | 98025c8c754391f5ea962fad788a6f2af02cb886 (diff) | |
| download | lwn-928487a1ceca5cd7e41bd78fa4a10098d8cc1ca9.tar.gz lwn-928487a1ceca5cd7e41bd78fa4a10098d8cc1ca9.zip | |
Merge branch 'samsung/cleanup' into next/cleanup
From Kukjin Kim:
Here, there are cleanup patches for Samsung v3.7 and most of them are
related to cleanup Samsung specific gpio API.
* samsung/cleanup:
gpio: samsung: Update documentation
ARM: S3C24XX: Use module_platform_driver macro in mach-osiris-dvs.c
ARM: S3C24XX: Use module_platform_driver macro in h1940-bluetooth.c
gpio-samsung: Remove now unused s3c2410_gpio* API
ARM: S3C24XX: Remove obsolete GPIO API declarations
ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib API
ARM: EXYNOS: cleanup unused code related to GPS
Diffstat (limited to 'arch/arm/mach-s3c24xx/h1940-bluetooth.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/h1940-bluetooth.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c index a5eeb62ce1c2..57aee916bdb1 100644 --- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c +++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c @@ -138,19 +138,7 @@ static struct platform_driver h1940bt_driver = { .remove = h1940bt_remove, }; - -static int __init h1940bt_init(void) -{ - return platform_driver_register(&h1940bt_driver); -} - -static void __exit h1940bt_exit(void) -{ - platform_driver_unregister(&h1940bt_driver); -} - -module_init(h1940bt_init); -module_exit(h1940bt_exit); +module_platform_driver(h1940bt_driver); MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>"); MODULE_DESCRIPTION("Driver for the iPAQ H1940 bluetooth chip"); |