From 3db7e90bb0f28a0ed2e9a7e9f30210286db6aadb Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Thu, 14 Mar 2013 14:09:31 -0300 Subject: [PATCH] --- yaml --- r: 366937 b: refs/heads/master c: 8c31aeca6787d31dd4bd90bf573da944b44a2208 h: refs/heads/master i: 366935: a6c09f1694bb1c28f6d59aba23c506f1bde6c9c5 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/atmel-isi.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index dfd7b26810e3..7c207f5db4f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2400a1f89d329ad8948c08e6e08fef33ce42f73b +refs/heads/master: 8c31aeca6787d31dd4bd90bf573da944b44a2208 diff --git a/trunk/drivers/media/platform/soc_camera/atmel-isi.c b/trunk/drivers/media/platform/soc_camera/atmel-isi.c index c314ff9b98dc..e7ccc5e7bf39 100644 --- a/trunk/drivers/media/platform/soc_camera/atmel-isi.c +++ b/trunk/drivers/media/platform/soc_camera/atmel-isi.c @@ -1074,7 +1074,6 @@ static int atmel_isi_probe(struct platform_device *pdev) } static struct platform_driver atmel_isi_driver = { - .probe = atmel_isi_probe, .remove = atmel_isi_remove, .driver = { .name = "atmel_isi", @@ -1082,17 +1081,7 @@ static struct platform_driver atmel_isi_driver = { }, }; -static int __init atmel_isi_init_module(void) -{ - return platform_driver_probe(&atmel_isi_driver, &atmel_isi_probe); -} - -static void __exit atmel_isi_exit(void) -{ - platform_driver_unregister(&atmel_isi_driver); -} -module_init(atmel_isi_init_module); -module_exit(atmel_isi_exit); +module_platform_driver_probe(atmel_isi_driver, atmel_isi_probe); MODULE_AUTHOR("Josh Wu "); MODULE_DESCRIPTION("The V4L2 driver for Atmel Linux");