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

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

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



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6b101926

drivers/media/video/cafe_ccic.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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;

drivers/media/video/s5p-fimc/fimc-capture.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

drivers/media/video/via-camera.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;