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

[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
...@@ -793,7 +793,6 @@ static struct sh_vou_pdata sh_vou_pdata = { ...@@ -793,7 +793,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
.flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
.board_info = &ak8813, .board_info = &ak8813,
.i2c_adap = 0, .i2c_adap = 0,
.module_name = "ak881x",
}; };
static struct resource sh_vou_resources[] = { static struct resource sh_vou_resources[] = {
......
...@@ -550,7 +550,6 @@ static struct sh_vou_pdata sh_vou_pdata = { ...@@ -550,7 +550,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
.flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
.board_info = &ak8813, .board_info = &ak8813,
.i2c_adap = 0, .i2c_adap = 0,
.module_name = "ak881x",
}; };
static struct resource sh_vou_resources[] = { static struct resource sh_vou_resources[] = {
......
...@@ -1406,7 +1406,7 @@ static int __devinit sh_vou_probe(struct platform_device *pdev) ...@@ -1406,7 +1406,7 @@ static int __devinit sh_vou_probe(struct platform_device *pdev)
goto ereset; goto ereset;
subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap, 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) { if (!subdev) {
ret = -ENOMEM; ret = -ENOMEM;
goto ei2cnd; goto ei2cnd;
......
...@@ -28,7 +28,6 @@ struct sh_vou_pdata { ...@@ -28,7 +28,6 @@ struct sh_vou_pdata {
int i2c_adap; int i2c_adap;
struct i2c_board_info *board_info; struct i2c_board_info *board_info;
unsigned long flags; unsigned long flags;
char *module_name;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment