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

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

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



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

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Heungjun Kim <riverful.kim@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Andrew Chew <achew@nvidia.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: Johannes Obermaier <johannes.obermaier@gmail.com>
Cc: Steven Toth <stoth@kernellabs.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a2d2b25c

drivers/media/dvb/frontends/au8522_decoder.c

+1 −12
Original line number Diff line number Diff line
@@ -839,15 +839,4 @@ static struct i2c_driver au8522_driver = { 
	.id_table	= au8522_id,

};



static __init int init_au8522(void)

{

	return i2c_add_driver(&au8522_driver);

}



static __exit void exit_au8522(void)

{

	i2c_del_driver(&au8522_driver);

}



module_init(init_au8522);

module_exit(exit_au8522);
 
module_i2c_driver(au8522_driver);

drivers/media/radio/radio-tea5764.c

+1 −18
Original line number Diff line number Diff line
@@ -575,21 +575,7 @@ static struct i2c_driver tea5764_i2c_driver = { 
	.id_table = tea5764_id,

};



/* init the driver */

static int __init tea5764_init(void)

{

	int ret = i2c_add_driver(&tea5764_i2c_driver);



	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ": "

		DRIVER_DESC "\n");

	return ret;

}



/* cleanup the driver */

static void __exit tea5764_exit(void)

{

	i2c_del_driver(&tea5764_i2c_driver);

}

module_i2c_driver(tea5764_i2c_driver);



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);
@@ -600,6 +586,3 @@ module_param(use_xtal, int, 0); 
MODULE_PARM_DESC(use_xtal, "Chip have a xtal connected in board");

module_param(radio_nr, int, 0);

MODULE_PARM_DESC(radio_nr, "video4linux device number to use");
 


module_init(tea5764_init);

module_exit(tea5764_exit);

drivers/media/radio/saa7706h.c

+1 −12
Original line number Diff line number Diff line
@@ -434,18 +434,7 @@ static struct i2c_driver saa7706h_driver = { 
	.id_table	= saa7706h_id,

};



static __init int saa7706h_init(void)

{

	return i2c_add_driver(&saa7706h_driver);

}



static __exit void saa7706h_exit(void)

{

	i2c_del_driver(&saa7706h_driver);

}



module_init(saa7706h_init);

module_exit(saa7706h_exit);

module_i2c_driver(saa7706h_driver);



MODULE_DESCRIPTION("SAA7706H Car Radio DSP driver");

MODULE_AUTHOR("Mocean Laboratories");

drivers/media/radio/si470x/radio-si470x-i2c.c

+1 −27
Original line number Diff line number Diff line
@@ -539,33 +539,7 @@ static struct i2c_driver si470x_i2c_driver = { 
	.id_table		= si470x_i2c_id,

};







/**************************************************************************

 * Module Interface

 **************************************************************************/



/*

 * si470x_i2c_init - module init

 */

static int __init si470x_i2c_init(void)

{

	printk(KERN_INFO DRIVER_DESC ", Version " DRIVER_VERSION "\n");

	return i2c_add_driver(&si470x_i2c_driver);

}





/*

 * si470x_i2c_exit - module exit

 */

static void __exit si470x_i2c_exit(void)

{

	i2c_del_driver(&si470x_i2c_driver);

}





module_init(si470x_i2c_init);

module_exit(si470x_i2c_exit);

module_i2c_driver(si470x_i2c_driver);



MODULE_LICENSE("GPL");

MODULE_AUTHOR(DRIVER_AUTHOR);

drivers/media/radio/si4713-i2c.c

+1 −14
Original line number Diff line number Diff line
@@ -2106,17 +2106,4 @@ static struct i2c_driver si4713_i2c_driver = { 
	.id_table       = si4713_id,

};



/* Module Interface */

static int __init si4713_module_init(void)

{

	return i2c_add_driver(&si4713_i2c_driver);

}



static void __exit si4713_module_exit(void)

{

	i2c_del_driver(&si4713_i2c_driver);

}



module_init(si4713_module_init);

module_exit(si4713_module_exit);

module_i2c_driver(si4713_i2c_driver);