Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Laurent Pinchart and committed by
Mauro Carvalho Chehab
2334e790 d4c03123

+1 -4
-1
arch/sh/boards/mach-ecovec24/setup.c
··· 793 793 .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, 794 794 .board_info = &ak8813, 795 795 .i2c_adap = 0, 796 - .module_name = "ak881x", 797 796 }; 798 797 799 798 static struct resource sh_vou_resources[] = {
-1
arch/sh/boards/mach-se/7724/setup.c
··· 550 550 .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, 551 551 .board_info = &ak8813, 552 552 .i2c_adap = 0, 553 - .module_name = "ak881x", 554 553 }; 555 554 556 555 static struct resource sh_vou_resources[] = {
+1 -1
drivers/media/video/sh_vou.c
··· 1406 1406 goto ereset; 1407 1407 1408 1408 subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap, 1409 - vou_pdata->module_name, vou_pdata->board_info, NULL); 1409 + NULL, vou_pdata->board_info, NULL); 1410 1410 if (!subdev) { 1411 1411 ret = -ENOMEM; 1412 1412 goto ei2cnd;
-1
include/media/sh_vou.h
··· 28 28 int i2c_adap; 29 29 struct i2c_board_info *board_info; 30 30 unsigned long flags; 31 - char *module_name; 32 31 }; 33 32 34 33 #endif