lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)

Browse Source 
With the v4l2_i2c_new_subdev* functions now supporting loading modules
based on modaliases, replace the hardcoded module name passed to those
functions by NULL in the cafe-ccic, via-camera and s5p-fimc drivers.

All corresponding I2C modules have been checked, and all of them include
a module aliases table with names corresponding to what the drivers
modified here use.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart
2010-10-23 09:13:37 -03:00
committed by Mauro Carvalho Chehab
parent 6b101926f9
commit aa2d8cbe16
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/cafe_ccic.c
View File

@@ -2066,8 +2066,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
cam->sensor_addr = 0x42; cam->sensor_addr = 0x42;
cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter, cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter,
"ov7670", "ov7670", 0, &sensor_cfg, cam->sensor_addr, NULL, "ov7670", 0, &sensor_cfg, cam->sensor_addr, NULL);
NULL);
if (cam->sensor == NULL) { if (cam->sensor == NULL) {
ret = -ENODEV; ret = -ENODEV;
goto out_smbus; goto out_smbus;

2
drivers/media/video/s5p-fimc/fimc-capture.c
View File

@@ -44,7 +44,7 @@ static struct v4l2_subdev *fimc_subdev_register(struct fimc_dev *fimc,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
sd = v4l2_i2c_new_subdev_board(&vid_cap->v4l2_dev, i2c_adap, sd = v4l2_i2c_new_subdev_board(&vid_cap->v4l2_dev, i2c_adap,
MODULE_NAME, isp_info->board_info, NULL); NULL, isp_info->board_info, NULL);
if (!sd) { if (!sd) {
v4l2_err(&vid_cap->v4l2_dev, "failed to acquire subdev\n"); v4l2_err(&vid_cap->v4l2_dev, "failed to acquire subdev\n");
return NULL; return NULL;

2
drivers/media/video/via-camera.c
View File

@@ -1360,7 +1360,7 @@ static __devinit int viacam_probe(struct platform_device *pdev)
*/ */
sensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31); sensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31);
cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter, cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter,
"ov7670", "ov7670", 0x42 >> 1, NULL); NULL, "ov7670", 0x42 >> 1, NULL);
if (cam->sensor == NULL) { if (cam->sensor == NULL) {
dev_err(&pdev->dev, "Unable to find the sensor!\n"); dev_err(&pdev->dev, "Unable to find the sensor!\n");
ret = -ENODEV; ret = -ENODEV;