diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:46:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:46:45 +0200 |
| commit | b43f9b59e65e1d4ff06474885b44515817868fdd (patch) | |
| tree | 0de0ca983a6624b0582034154da4d17a170caf1e /drivers/ata/pata_samsung_cf.c | |
| parent | staging: sync: Add compat_ioctl handlers to sync drivers (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-b43f9b59e65e1d4ff06474885b44515817868fdd.tar.xz linux-b43f9b59e65e1d4ff06474885b44515817868fdd.zip | |
Merge 3.9-rc5 into staging-next
This pulls in all of the good fixes we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ata/pata_samsung_cf.c')
| -rw-r--r-- | drivers/ata/pata_samsung_cf.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 70b0e01372b3..6ef27e98c508 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c @@ -661,18 +661,7 @@ static struct platform_driver pata_s3c_driver = { }, }; -static int __init pata_s3c_init(void) -{ - return platform_driver_probe(&pata_s3c_driver, pata_s3c_probe); -} - -static void __exit pata_s3c_exit(void) -{ - platform_driver_unregister(&pata_s3c_driver); -} - -module_init(pata_s3c_init); -module_exit(pata_s3c_exit); +module_platform_driver_probe(pata_s3c_driver, pata_s3c_probe); MODULE_AUTHOR("Abhilash Kesavan, <a.kesavan@samsung.com>"); MODULE_DESCRIPTION("low-level driver for Samsung PATA controller"); |