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

Commit 2334e790 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] sh_vou: Don't use module names to load I2C modules 



With the v4l2_i2c_new_subdev* functions now supporting loading modules
based on modaliases, remove the module names hardcoded in platform data
and pass a NULL module name to those functions.

All corresponding I2C modules have been checked, and all of them include
a module aliases table with names corresponding to what the sh_vou
platform data uses.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d4c03123

arch/sh/boards/mach-ecovec24/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ static struct sh_vou_pdata sh_vou_pdata = { 
	.flags		= SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,

	.board_info	= &ak8813,

	.i2c_adap	= 0,

	.module_name	= "ak881x",

};



static struct resource sh_vou_resources[] = {

arch/sh/boards/mach-se/7724/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ static struct sh_vou_pdata sh_vou_pdata = { 
	.flags		= SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,

	.board_info	= &ak8813,

	.i2c_adap	= 0,

	.module_name	= "ak881x",

};



static struct resource sh_vou_resources[] = {

drivers/media/video/sh_vou.c

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ static int __devinit sh_vou_probe(struct platform_device *pdev) 
		goto ereset;



	subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap,

			vou_pdata->module_name, vou_pdata->board_info, NULL);

			NULL, vou_pdata->board_info, NULL);

	if (!subdev) {

		ret = -ENOMEM;

		goto ei2cnd;

include/media/sh_vou.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct sh_vou_pdata { 
	int i2c_adap;

	struct i2c_board_info *board_info;

	unsigned long flags;

	char *module_name;

};



#endif