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

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

[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions 



The argument isn't used anymore by the functions, remove it.

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

drivers/media/radio/radio-si4713.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev) 
		goto unregister_v4l2_dev;

	}



	sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter, NULL,

	sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter,

					pdata->subdev_board_info, NULL);

	if (!sd) {

		dev_err(&pdev->dev, "Cannot get v4l2 subdevice\n");

drivers/media/video/au0828/au0828-cards.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ void au0828_card_setup(struct au0828_dev *dev) 
		   be abstracted out if we ever need to support a different

		   demod) */

		sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,

				NULL, "au8522", 0x8e >> 1, NULL);

				"au8522", 0x8e >> 1, NULL);

		if (sd == NULL)

			printk(KERN_ERR "analog subdev registration failed\n");

	}
@@ -221,7 +221,7 @@ void au0828_card_setup(struct au0828_dev *dev) 
	if (dev->board.tuner_type != TUNER_ABSENT) {

		/* Load the tuner module, which does the attach */

		sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,

				NULL, "tuner", dev->board.tuner_addr, NULL);

				"tuner", dev->board.tuner_addr, NULL);

		if (sd == NULL)

			printk(KERN_ERR "tuner subdev registration fail\n");

drivers/media/video/bt8xx/bttv-cards.c

+11 −11
Original line number Diff line number Diff line
@@ -3529,7 +3529,7 @@ void __devinit bttv_init_card2(struct bttv *btv) 
		struct v4l2_subdev *sd;



		sd = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

			&btv->c.i2c_adap, NULL, "saa6588", 0, addrs);

			&btv->c.i2c_adap, "saa6588", 0, addrs);

		btv->has_saa6588 = (sd != NULL);

	}
@@ -3554,7 +3554,7 @@ void __devinit bttv_init_card2(struct bttv *btv) 
		};



		btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

			&btv->c.i2c_adap, NULL, "msp3400", 0, addrs);

			&btv->c.i2c_adap, "msp3400", 0, addrs);

		if (btv->sd_msp34xx)

			return;

		goto no_audio;
@@ -3568,7 +3568,7 @@ void __devinit bttv_init_card2(struct bttv *btv) 
		};



		if (v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

				&btv->c.i2c_adap, NULL, "tda7432", 0, addrs))

				&btv->c.i2c_adap, "tda7432", 0, addrs))

			return;

		goto no_audio;

	}
@@ -3576,7 +3576,7 @@ void __devinit bttv_init_card2(struct bttv *btv) 
	case 3: {

		/* The user specified that we should probe for tvaudio */

		btv->sd_tvaudio = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

			&btv->c.i2c_adap, NULL, "tvaudio", 0, tvaudio_addrs());

			&btv->c.i2c_adap, "tvaudio", 0, tvaudio_addrs());

		if (btv->sd_tvaudio)

			return;

		goto no_audio;
@@ -3596,11 +3596,11 @@ void __devinit bttv_init_card2(struct bttv *btv) 
	   found is really something else (e.g. a tea6300). */

	if (!bttv_tvcards[btv->c.type].no_msp34xx) {

		btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

			&btv->c.i2c_adap, NULL, "msp3400",

			&btv->c.i2c_adap, "msp3400",

			0, I2C_ADDRS(I2C_ADDR_MSP3400 >> 1));

	} else if (bttv_tvcards[btv->c.type].msp34xx_alt) {

		btv->sd_msp34xx = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

			&btv->c.i2c_adap, NULL, "msp3400",

			&btv->c.i2c_adap, "msp3400",

			0, I2C_ADDRS(I2C_ADDR_MSP3400_ALT >> 1));

	}
@@ -3616,13 +3616,13 @@ void __devinit bttv_init_card2(struct bttv *btv) 
		};



		if (v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

				&btv->c.i2c_adap, NULL, "tda7432", 0, addrs))

				&btv->c.i2c_adap, "tda7432", 0, addrs))

			return;

	}



	/* Now see if we can find one of the tvaudio devices. */

	btv->sd_tvaudio = v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

		&btv->c.i2c_adap, NULL, "tvaudio", 0, tvaudio_addrs());

		&btv->c.i2c_adap, "tvaudio", 0, tvaudio_addrs());

	if (btv->sd_tvaudio)

		return;
@@ -3646,13 +3646,13 @@ void __devinit bttv_init_tuner(struct bttv *btv) 
		/* Load tuner module before issuing tuner config call! */

		if (bttv_tvcards[btv->c.type].has_radio)

			v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

				&btv->c.i2c_adap, NULL, "tuner",

				&btv->c.i2c_adap, "tuner",

				0, v4l2_i2c_tuner_addrs(ADDRS_RADIO));

		v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

				&btv->c.i2c_adap, NULL, "tuner",

				&btv->c.i2c_adap, "tuner",

				0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));

		v4l2_i2c_new_subdev(&btv->c.v4l2_dev,

				&btv->c.i2c_adap, NULL, "tuner",

				&btv->c.i2c_adap, "tuner",

				0, v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));



		tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;

drivers/media/video/cafe_ccic.c

+1 −1
Original line number Diff line number Diff line
@@ -2066,7 +2066,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, 


	cam->sensor_addr = 0x42;

	cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter,

			NULL, "ov7670", 0, &sensor_cfg, cam->sensor_addr, NULL);

			"ov7670", 0, &sensor_cfg, cam->sensor_addr, NULL);

	if (cam->sensor == NULL) {

		ret = -ENODEV;

		goto out_smbus;

drivers/media/video/cx18/cx18-i2c.c

+4 −4
Original line number Diff line number Diff line
@@ -122,15 +122,15 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx) 
	if (hw == CX18_HW_TUNER) {

		/* special tuner group handling */

		sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,

				adap, NULL, type, 0, cx->card_i2c->radio);

				adap, type, 0, cx->card_i2c->radio);

		if (sd != NULL)

			sd->grp_id = hw;

		sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,

				adap, NULL, type, 0, cx->card_i2c->demod);

				adap, type, 0, cx->card_i2c->demod);

		if (sd != NULL)

			sd->grp_id = hw;

		sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,

				adap, NULL, type, 0, cx->card_i2c->tv);

				adap, type, 0, cx->card_i2c->tv);

		if (sd != NULL)

			sd->grp_id = hw;

		return sd != NULL ? 0 : -1;
@@ -144,7 +144,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx) 
		return -1;



	/* It's an I2C device other than an analog tuner or IR chip */

	sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, NULL, type, hw_addrs[idx],

	sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, type, hw_addrs[idx],

				 NULL);

	if (sd != NULL)

		sd->grp_id = hw;