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

Commit 95d2608b authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: start moving em28xx-v4l specific data to its own struct 



That reduces a little bit the memory footprint when em28xx-video
is not loaded.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ad298055

drivers/media/usb/em28xx/em28xx-camera.c

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ int em28xx_init_camera(struct em28xx *dev) 
		dev->sensor_xtal = 4300000;

		pdata.xtal = dev->sensor_xtal;

		if (NULL ==

		    v4l2_i2c_new_subdev_board(&dev->v4l2_dev, adap,

		    v4l2_i2c_new_subdev_board(&dev->v4l2->v4l2_dev, adap,

					      &mt9v011_info, NULL)) {

			ret = -ENODEV;

			break;
@@ -422,7 +422,7 @@ int em28xx_init_camera(struct em28xx *dev) 
		dev->sensor_yres = 480;



		subdev =

		     v4l2_i2c_new_subdev_board(&dev->v4l2_dev, adap,

		     v4l2_i2c_new_subdev_board(&dev->v4l2->v4l2_dev, adap,

					       &ov2640_info, NULL);

		if (NULL == subdev) {

			ret = -ENODEV;

drivers/media/usb/em28xx/em28xx-video.c

+107 −53
Original line number Diff line number Diff line
@@ -189,10 +189,11 @@ static int em28xx_vbi_supported(struct em28xx *dev) 
 */

static void em28xx_wake_i2c(struct em28xx *dev)

{

	v4l2_device_call_all(&dev->v4l2_dev, 0, core,  reset, 0);

	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,

	struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;

	v4l2_device_call_all(v4l2_dev, 0, core,  reset, 0);

	v4l2_device_call_all(v4l2_dev, 0, video, s_routing,

			INPUT(dev->ctl_input)->vmux, 0, 0);

	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);

	v4l2_device_call_all(v4l2_dev, 0, video, s_stream, 0);

}



static int em28xx_colorlevels_set_default(struct em28xx *dev)
@@ -952,7 +953,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count) 
			f.type = V4L2_TUNER_RADIO;

		else

			f.type = V4L2_TUNER_ANALOG_TV;

		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);

		v4l2_device_call_all(&dev->v4l2->v4l2_dev,

				     0, tuner, s_frequency, &f);

	}



	dev->streaming_users++;
@@ -1079,6 +1081,7 @@ static int em28xx_vb2_setup(struct em28xx *dev) 


static void video_mux(struct em28xx *dev, int index)

{

	struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;

	dev->ctl_input = index;

	dev->ctl_ainput = INPUT(index)->amux;

	dev->ctl_aoutput = INPUT(index)->aout;
@@ -1086,21 +1089,21 @@ static void video_mux(struct em28xx *dev, int index) 
	if (!dev->ctl_aoutput)

		dev->ctl_aoutput = EM28XX_AOUT_MASTER;



	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,

	v4l2_device_call_all(v4l2_dev, 0, video, s_routing,

			INPUT(index)->vmux, 0, 0);



	if (dev->board.has_msp34xx) {

		if (dev->i2s_speed) {

			v4l2_device_call_all(&dev->v4l2_dev, 0, audio,

			v4l2_device_call_all(v4l2_dev, 0, audio,

				s_i2s_clock_freq, dev->i2s_speed);

		}

		/* Note: this is msp3400 specific */

		v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing,

		v4l2_device_call_all(v4l2_dev, 0, audio, s_routing,

			 dev->ctl_ainput, MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);

	}



	if (dev->board.adecoder != EM28XX_NOADECODER) {

		v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing,

		v4l2_device_call_all(v4l2_dev, 0, audio, s_routing,

			dev->ctl_ainput, dev->ctl_aoutput, 0);

	}
@@ -1340,7 +1343,7 @@ static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *norm) 
	struct em28xx_fh   *fh  = priv;

	struct em28xx      *dev = fh->dev;



	v4l2_device_call_all(&dev->v4l2_dev, 0, video, querystd, norm);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, video, querystd, norm);



	return 0;

}
@@ -1370,7 +1373,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) 
	size_to_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);



	em28xx_resolution_set(dev);

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, core, s_std, dev->norm);



	return 0;

}
@@ -1384,7 +1387,7 @@ static int vidioc_g_parm(struct file *file, void *priv, 


	p->parm.capture.readbuffers = EM28XX_MIN_BUF;

	if (dev->board.is_webcam)

		rc = v4l2_device_call_until_err(&dev->v4l2_dev, 0,

		rc = v4l2_device_call_until_err(&dev->v4l2->v4l2_dev, 0,

						video, g_parm, p);

	else

		v4l2_video_std_frame_period(dev->norm,
@@ -1400,7 +1403,8 @@ static int vidioc_s_parm(struct file *file, void *priv, 
	struct em28xx      *dev = fh->dev;



	p->parm.capture.readbuffers = EM28XX_MIN_BUF;

	return v4l2_device_call_until_err(&dev->v4l2_dev, 0, video, s_parm, p);

	return v4l2_device_call_until_err(&dev->v4l2->v4l2_dev,

					  0, video, s_parm, p);

}



static const char *iname[] = {
@@ -1539,7 +1543,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, 


	strcpy(t->name, "Tuner");



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, g_tuner, t);

	return 0;

}
@@ -1552,7 +1556,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, 
	if (0 != t->index)

		return -EINVAL;



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_tuner, t);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, s_tuner, t);

	return 0;

}
@@ -1575,12 +1579,13 @@ static int vidioc_s_frequency(struct file *file, void *priv, 
	struct v4l2_frequency  new_freq = *f;

	struct em28xx_fh          *fh   = priv;

	struct em28xx             *dev  = fh->dev;

	struct em28xx_v4l2        *v4l2 = dev->v4l2;



	if (0 != f->tuner)

		return -EINVAL;



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, f);

	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_frequency, &new_freq);

	v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, s_frequency, f);

	v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, g_frequency, &new_freq);

	dev->ctl_freq = new_freq.frequency;



	return 0;
@@ -1598,7 +1603,8 @@ static int vidioc_g_chip_info(struct file *file, void *priv, 
	if (chip->match.addr == 1)

		strlcpy(chip->name, "ac97", sizeof(chip->name));

	else

		strlcpy(chip->name, dev->v4l2_dev.name, sizeof(chip->name));

		strlcpy(chip->name,

			dev->v4l2->v4l2_dev.name, sizeof(chip->name));

	return 0;

}
@@ -1810,7 +1816,7 @@ static int radio_g_tuner(struct file *file, void *priv, 


	strcpy(t->name, "Radio");



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, g_tuner, t);



	return 0;

}
@@ -1823,11 +1829,25 @@ static int radio_s_tuner(struct file *file, void *priv, 
	if (0 != t->index)

		return -EINVAL;



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_tuner, t);

	v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, s_tuner, t);



	return 0;

}



/*

 * em28xx_free_v4l2() - Free struct em28xx_v4l2

 *

 * @ref: struct kref for struct em28xx_v4l2

 *

 * Called when all users of struct em28xx_v4l2 are gone

 */

void em28xx_free_v4l2(struct kref *ref)

{

	struct em28xx_v4l2 *v4l2 = container_of(ref, struct em28xx_v4l2, ref);



	kfree(v4l2);

}



/*

 * em28xx_v4l2_open()

 * inits the device and starts isoc transfer
@@ -1836,6 +1856,7 @@ static int em28xx_v4l2_open(struct file *filp) 
{

	struct video_device *vdev = video_devdata(filp);

	struct em28xx *dev = video_drvdata(filp);

	struct em28xx_v4l2 *v4l2 = dev->v4l2;

	enum v4l2_buf_type fh_type = 0;

	struct em28xx_fh *fh;
@@ -1884,10 +1905,11 @@ static int em28xx_v4l2_open(struct file *filp) 


	if (vdev->vfl_type == VFL_TYPE_RADIO) {

		em28xx_videodbg("video_open: setting radio device\n");

		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_radio);

		v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, s_radio);

	}



	kref_get(&dev->ref);

	kref_get(&v4l2->ref);

	dev->users++;



	mutex_unlock(&dev->lock);
@@ -1903,6 +1925,8 @@ static int em28xx_v4l2_open(struct file *filp) 
*/

static int em28xx_v4l2_fini(struct em28xx *dev)

{

	struct em28xx_v4l2 *v4l2 = dev->v4l2;



	if (dev->is_audio_only) {

		/* Shouldn't initialize IR for this interface */

		return 0;
@@ -1913,11 +1937,14 @@ static int em28xx_v4l2_fini(struct em28xx *dev) 
		return 0;

	}



	if (v4l2 == NULL)

		return 0;



	em28xx_info("Closing video extension");



	mutex_lock(&dev->lock);



	v4l2_device_disconnect(&dev->v4l2_dev);

	v4l2_device_disconnect(&v4l2->v4l2_dev);



	em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
@@ -1938,14 +1965,17 @@ static int em28xx_v4l2_fini(struct em28xx *dev) 
	}



	v4l2_ctrl_handler_free(&dev->ctrl_handler);

	v4l2_device_unregister(&dev->v4l2_dev);

	v4l2_device_unregister(&v4l2->v4l2_dev);



	if (dev->clk) {

		v4l2_clk_unregister_fixed(dev->clk);

		dev->clk = NULL;

	}



	kref_put(&v4l2->ref, em28xx_free_v4l2);



	mutex_unlock(&dev->lock);



	kref_put(&dev->ref, em28xx_free_device);



	return 0;
@@ -1986,6 +2016,7 @@ static int em28xx_v4l2_close(struct file *filp) 
{

	struct em28xx_fh      *fh   = filp->private_data;

	struct em28xx         *dev  = fh->dev;

	struct em28xx_v4l2    *v4l2 = dev->v4l2;

	int              errCode;



	em28xx_videodbg("users=%d\n", dev->users);
@@ -1999,7 +2030,7 @@ static int em28xx_v4l2_close(struct file *filp) 
			goto exit;



		/* Save some power by putting tuner to sleep */

		v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);

		v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0);



		/* do this before setting alternate! */

		em28xx_set_mode(dev, EM28XX_SUSPEND);
@@ -2015,6 +2046,7 @@ static int em28xx_v4l2_close(struct file *filp) 
	}



exit:

	kref_put(&v4l2->ref, em28xx_free_v4l2);

	dev->users--;

	mutex_unlock(&dev->lock);

	kref_put(&dev->ref, em28xx_free_device);
@@ -2158,7 +2190,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, 
		return NULL;



	*vfd		= *template;

	vfd->v4l2_dev	= &dev->v4l2_dev;

	vfd->v4l2_dev	= &dev->v4l2->v4l2_dev;

	vfd->debug	= video_debug;

	vfd->lock	= &dev->lock;

	set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
@@ -2174,6 +2206,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, 


static void em28xx_tuner_setup(struct em28xx *dev)

{

	struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;

	struct tuner_setup           tun_setup;

	struct v4l2_frequency        f;
@@ -2189,14 +2222,16 @@ static void em28xx_tuner_setup(struct em28xx *dev) 
		tun_setup.type = dev->board.radio.type;

		tun_setup.addr = dev->board.radio_addr;



		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_type_addr, &tun_setup);

		v4l2_device_call_all(v4l2_dev,

				     0, tuner, s_type_addr, &tun_setup);

	}



	if ((dev->tuner_type != TUNER_ABSENT) && (dev->tuner_type)) {

		tun_setup.type   = dev->tuner_type;

		tun_setup.addr   = dev->tuner_addr;



		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_type_addr, &tun_setup);

		v4l2_device_call_all(v4l2_dev,

				     0, tuner, s_type_addr, &tun_setup);

	}



	if (dev->tda9887_conf) {
@@ -2205,7 +2240,8 @@ static void em28xx_tuner_setup(struct em28xx *dev) 
		tda9887_cfg.tuner = TUNER_TDA9887;

		tda9887_cfg.priv = &dev->tda9887_conf;



		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_config, &tda9887_cfg);

		v4l2_device_call_all(v4l2_dev,

				     0, tuner, s_config, &tda9887_cfg);

	}



	if (dev->tuner_type == TUNER_XC2028) {
@@ -2220,7 +2256,7 @@ static void em28xx_tuner_setup(struct em28xx *dev) 
		xc2028_cfg.tuner = TUNER_XC2028;

		xc2028_cfg.priv  = &ctl;



		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_config, &xc2028_cfg);

		v4l2_device_call_all(v4l2_dev, 0, tuner, s_config, &xc2028_cfg);

	}



	/* configure tuner */
@@ -2228,7 +2264,7 @@ static void em28xx_tuner_setup(struct em28xx *dev) 
	f.type = V4L2_TUNER_ANALOG_TV;

	f.frequency = 9076;     /* just a magic number */

	dev->ctl_freq = f.frequency;

	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);

	v4l2_device_call_all(v4l2_dev, 0, tuner, s_frequency, &f);

}



static int em28xx_v4l2_init(struct em28xx *dev)
@@ -2237,6 +2273,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	int ret;

	unsigned int maxw;

	struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler;

	struct em28xx_v4l2 *v4l2;



	if (dev->is_audio_only) {

		/* Shouldn't initialize IR for this interface */
@@ -2252,14 +2289,23 @@ static int em28xx_v4l2_init(struct em28xx *dev) 


	mutex_lock(&dev->lock);



	ret = v4l2_device_register(&dev->udev->dev, &dev->v4l2_dev);

	v4l2 = kzalloc(sizeof(struct em28xx_v4l2), GFP_KERNEL);

	if (v4l2 == NULL) {

		em28xx_info("em28xx_v4l: memory allocation failed\n");

		mutex_unlock(&dev->lock);

		return -ENOMEM;

	}

	kref_init(&v4l2->ref);

	dev->v4l2 = v4l2;



	ret = v4l2_device_register(&dev->udev->dev, &v4l2->v4l2_dev);

	if (ret < 0) {

		em28xx_errdev("Call to v4l2_device_register() failed!\n");

		goto err;

	}



	v4l2_ctrl_handler_init(hdl, 8);

	dev->v4l2_dev.ctrl_handler = hdl;

	v4l2->v4l2_dev.ctrl_handler = hdl;



	/*

	 * Default format, used for tvp5150 or saa711x output formats
@@ -2271,19 +2317,23 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	/* request some modules */



	if (dev->board.has_msp34xx)

		v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

		v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				    &dev->i2c_adap[dev->def_i2c_bus],

				    "msp3400", 0, msp3400_addrs);



	if (dev->board.decoder == EM28XX_SAA711X)

		v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

		v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				    &dev->i2c_adap[dev->def_i2c_bus],

				    "saa7115_auto", 0, saa711x_addrs);



	if (dev->board.decoder == EM28XX_TVP5150)

		v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

		v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				    &dev->i2c_adap[dev->def_i2c_bus],

				    "tvp5150", 0, tvp5150_addrs);



	if (dev->board.adecoder == EM28XX_TVAUDIO)

		v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

		v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				    &dev->i2c_adap[dev->def_i2c_bus],

				    "tvaudio", dev->board.tvaudio_addr, NULL);



	/* Initialize tuner and camera */
@@ -2292,11 +2342,12 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
		int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);



		if (dev->board.radio.type)

			v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

			v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

					  &dev->i2c_adap[dev->def_i2c_bus],

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



		if (has_demod)

			v4l2_i2c_new_subdev(&dev->v4l2_dev,

			v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				&dev->i2c_adap[dev->def_i2c_bus], "tuner",

				0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));

		if (dev->tuner_addr == 0) {
@@ -2304,14 +2355,15 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
				has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;

			struct v4l2_subdev *sd;



			sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,

			sd = v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

				&dev->i2c_adap[dev->def_i2c_bus], "tuner",

				0, v4l2_i2c_tuner_addrs(type));



			if (sd)

				dev->tuner_addr = v4l2_i2c_subdev_addr(sd);

		} else {

			v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap[dev->def_i2c_bus],

			v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

					    &dev->i2c_adap[dev->def_i2c_bus],

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

		}

	}
@@ -2368,7 +2420,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 


	/* set default norm */

	dev->norm = V4L2_STD_PAL;

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);

	v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_std, dev->norm);

	dev->interlaced = EM28XX_INTERLACED_DEFAULT;



	/* Analog specific initialization */
@@ -2525,7 +2577,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
			    video_device_node_name(dev->vbi_dev));



	/* Save some power by putting tuner to sleep */

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);

	v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0);



	/* initialize videobuf2 stuff */

	em28xx_vb2_setup(dev);
@@ -2539,8 +2591,10 @@ static int em28xx_v4l2_init(struct em28xx *dev) 


unregister_dev:

	v4l2_ctrl_handler_free(&dev->ctrl_handler);

	v4l2_device_unregister(&dev->v4l2_dev);

	v4l2_device_unregister(&v4l2->v4l2_dev);

err:

	dev->v4l2 = NULL;

	kref_put(&v4l2->ref, em28xx_free_v4l2);

	mutex_unlock(&dev->lock);

	return ret;

}

drivers/media/usb/em28xx/em28xx.h

+7 −1
Original line number Diff line number Diff line
@@ -498,6 +498,12 @@ struct em28xx_eeprom { 
#define EM28XX_RESOURCE_VIDEO 0x01

#define EM28XX_RESOURCE_VBI   0x02



struct em28xx_v4l2 {

	struct kref ref;



	struct v4l2_device v4l2_dev;

};



struct em28xx_audio {

	char name[50];

	unsigned num_urb;
@@ -543,6 +549,7 @@ struct em28xx { 
	struct kref ref;



	/* Sub-module data */

	struct em28xx_v4l2 *v4l2;

	struct em28xx_dvb *dvb;

	struct em28xx_audio adev;

	struct em28xx_IR *ir;
@@ -560,7 +567,6 @@ struct em28xx { 
	unsigned int has_alsa_audio:1;

	unsigned int is_audio_only:1;



	struct v4l2_device v4l2_dev;

	struct v4l2_ctrl_handler ctrl_handler;

	struct v4l2_clk *clk;

	struct em28xx_board board;