From 6c7bfd3e511545cf01df031144be4e9be9ac7018 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Tue, 16 Oct 2012 11:56:59 +0800 Subject: [PATCH] --- yaml --- r: 342688 b: refs/heads/master c: 5c86ac695c7e2402f60e30ad8174ceb66ef22a91 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/atmel-ssc.c | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 26b5379147d2..e8d5e33dfbd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e4de7b32adc239d566cd02751c31d0847f68e86 +refs/heads/master: 5c86ac695c7e2402f60e30ad8174ceb66ef22a91 diff --git a/trunk/drivers/misc/atmel-ssc.c b/trunk/drivers/misc/atmel-ssc.c index 23dcb76abdaf..ac00f83ea86b 100644 --- a/trunk/drivers/misc/atmel-ssc.c +++ b/trunk/drivers/misc/atmel-ssc.c @@ -68,7 +68,7 @@ void ssc_free(struct ssc_device *ssc) } EXPORT_SYMBOL(ssc_free); -static int __init ssc_probe(struct platform_device *pdev) +static int ssc_probe(struct platform_device *pdev) { struct resource *regs; struct ssc_device *ssc; @@ -135,24 +135,14 @@ static int __devexit ssc_remove(struct platform_device *pdev) } static struct platform_driver ssc_driver = { - .remove = __devexit_p(ssc_remove), .driver = { .name = "ssc", .owner = THIS_MODULE, }, + .probe = ssc_probe, + .remove = __devexit_p(ssc_remove), }; - -static int __init ssc_init(void) -{ - return platform_driver_probe(&ssc_driver, ssc_probe); -} -module_init(ssc_init); - -static void __exit ssc_exit(void) -{ - platform_driver_unregister(&ssc_driver); -} -module_exit(ssc_exit); +module_platform_driver(ssc_driver); MODULE_AUTHOR("Hans-Christian Egtvedt "); MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");