Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d6629b1 authored by Axel Lin's avatar Axel Lin Committed by Mauro Carvalho Chehab
Browse files

[media] convert drivers/media/* to use module_platform_driver() 



This patch converts the drivers in drivers/media/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: "Richard Röjfors" <richard.rojfors@pelagicore.com>
Cc: "Matti J. Aaltonen" <matti.j.aaltonen@nokia.com>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Manjunath Hadli <manjunath.hadli@ti.com>
Cc: Muralidharan Karicheri <m-karicheri2@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarMatti J. Aaltonen <matti.j.aaltonen@nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aa5fb974

drivers/media/radio/radio-si4713.c

+1 −14
Original line number Diff line number Diff line
@@ -355,17 +355,4 @@ static struct platform_driver radio_si4713_pdriver = { 
	.remove         = __exit_p(radio_si4713_pdriver_remove),

};



/* Module Interface */

static int __init radio_si4713_module_init(void)

{

	return platform_driver_register(&radio_si4713_pdriver);

}



static void __exit radio_si4713_module_exit(void)

{

	platform_driver_unregister(&radio_si4713_pdriver);

}



module_init(radio_si4713_module_init);

module_exit(radio_si4713_module_exit);

module_platform_driver(radio_si4713_pdriver);

drivers/media/radio/radio-timb.c

+1 −14
Original line number Diff line number Diff line
@@ -226,20 +226,7 @@ static struct platform_driver timbradio_platform_driver = { 
	.remove		= timbradio_remove,

};



/*--------------------------------------------------------------------------*/



static int __init timbradio_init(void)

{

	return platform_driver_register(&timbradio_platform_driver);

}



static void __exit timbradio_exit(void)

{

	platform_driver_unregister(&timbradio_platform_driver);

}



module_init(timbradio_init);

module_exit(timbradio_exit);

module_platform_driver(timbradio_platform_driver);



MODULE_DESCRIPTION("Timberdale Radio driver");

MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");

drivers/media/radio/radio-wl1273.c

+2 −15
Original line number Diff line number Diff line
@@ -2148,8 +2148,6 @@ static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev) 
	return r;

}



MODULE_ALIAS("platform:wl1273_fm_radio");



static struct platform_driver wl1273_fm_radio_driver = {

	.probe		= wl1273_fm_radio_probe,

	.remove		= __devexit_p(wl1273_fm_radio_remove),
@@ -2159,20 +2157,9 @@ static struct platform_driver wl1273_fm_radio_driver = { 
	},

};



static int __init wl1273_fm_module_init(void)

{

	pr_info("%s\n", __func__);

	return platform_driver_register(&wl1273_fm_radio_driver);

}

module_init(wl1273_fm_module_init);



static void __exit wl1273_fm_module_exit(void)

{

	platform_driver_unregister(&wl1273_fm_radio_driver);

	pr_info(DRIVER_DESC ", Exiting.\n");

}

module_exit(wl1273_fm_module_exit);

module_platform_driver(wl1273_fm_radio_driver);



MODULE_AUTHOR("Matti Aaltonen <matti.j.aaltonen@nokia.com>");

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:wl1273_fm_radio");

drivers/media/video/davinci/dm355_ccdc.c

+1 −12
Original line number Diff line number Diff line
@@ -1069,15 +1069,4 @@ static struct platform_driver dm355_ccdc_driver = { 
	.probe = dm355_ccdc_probe,

};



static int __init dm355_ccdc_init(void)

{

	return platform_driver_register(&dm355_ccdc_driver);

}



static void __exit dm355_ccdc_exit(void)

{

	platform_driver_unregister(&dm355_ccdc_driver);

}



module_init(dm355_ccdc_init);

module_exit(dm355_ccdc_exit);
 
module_platform_driver(dm355_ccdc_driver);

drivers/media/video/davinci/dm644x_ccdc.c

+1 −12
Original line number Diff line number Diff line
@@ -1078,15 +1078,4 @@ static struct platform_driver dm644x_ccdc_driver = { 
	.probe = dm644x_ccdc_probe,

};



static int __init dm644x_ccdc_init(void)

{

	return platform_driver_register(&dm644x_ccdc_driver);

}



static void __exit dm644x_ccdc_exit(void)

{

	platform_driver_unregister(&dm644x_ccdc_driver);

}



module_init(dm644x_ccdc_init);

module_exit(dm644x_ccdc_exit);
 
module_platform_driver(dm644x_ccdc_driver);