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

Commit aa62980b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: em28xx: stop rewriting device's struct 



Writing at the device's struct is evil, as two em28xx devices
may be using it. So, stop abusing it, storing the values
inside struct em28xx_dev.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6cda90b6

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

+8 −6
Original line number Diff line number Diff line
@@ -2712,6 +2712,8 @@ static inline void em28xx_set_xclk_i2c_speed(struct em28xx *dev) 
static inline void em28xx_set_model(struct em28xx *dev)

{

	dev->board = em28xx_boards[dev->model];

	dev->has_msp34xx = dev->board.has_msp34xx;

	dev->is_webcam = dev->board.is_webcam;



	em28xx_set_xclk_i2c_speed(dev);
@@ -2871,7 +2873,7 @@ static int em28xx_hint_board(struct em28xx *dev) 
{

	int i;



	if (dev->board.is_webcam) {

	if (dev->is_webcam) {

		if (dev->em28xx_sensor == EM28XX_MT9V011) {

			dev->model = EM2820_BOARD_SILVERCREST_WEBCAM;

		} else if (dev->em28xx_sensor == EM28XX_MT9M001 ||
@@ -2963,11 +2965,11 @@ static void em28xx_card_setup(struct em28xx *dev) 
	 * If the device can be a webcam, seek for a sensor.

	 * If sensor is not found, then it isn't a webcam.

	 */

	if (dev->board.is_webcam) {

	if (dev->is_webcam) {

		em28xx_detect_sensor(dev);

		if (dev->em28xx_sensor == EM28XX_NOSENSOR)

			/* NOTE: error/unknown sensor/no sensor */

			dev->board.is_webcam = 0;

			dev->is_webcam = 0;

	}



	switch (dev->model) {
@@ -3029,7 +3031,7 @@ static void em28xx_card_setup(struct em28xx *dev) 


		if (tv.audio_processor == TVEEPROM_AUDPROC_MSP) {

			dev->i2s_speed = 2048000;

			dev->board.has_msp34xx = 1;

			dev->has_msp34xx = 1;

		}

		break;

	}
@@ -3742,7 +3744,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, 
	}



	if (usb_xfer_mode < 0) {

		if (dev->board.is_webcam)

		if (dev->is_webcam)

			try_bulk = 1;

		else

			try_bulk = 0;
@@ -3794,7 +3796,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, 
		dev->dev_next->board.has_ir_i2c = 0; /* No IR for 2nd tuner */



		if (usb_xfer_mode < 0) {

			if (dev->dev_next->board.is_webcam)

			if (dev->dev_next->is_webcam)

				try_bulk = 1;

			else

				try_bulk = 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int em28xx_set_audio_source(struct em28xx *dev) 
			return ret;

	}



	if (dev->board.has_msp34xx)

	if (dev->has_msp34xx)

		input = EM28XX_AUDIO_SRC_TUNER;

	else {

		switch (dev->ctl_ainput) {
@@ -672,7 +672,7 @@ int em28xx_capture_start(struct em28xx *dev, int start) 
			return rc;



		if (start) {

			if (dev->board.is_webcam)

			if (dev->is_webcam)

				rc = em28xx_write_reg(dev, 0x13, 0x0c);



			/* Enable video capture */

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

+13 −13
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static inline unsigned int norm_maxw(struct em28xx *dev) 
{

	struct em28xx_v4l2 *v4l2 = dev->v4l2;



	if (dev->board.is_webcam)

	if (dev->is_webcam)

		return v4l2->sensor_xres;



	if (dev->board.max_range_640_480)
@@ -161,7 +161,7 @@ static inline unsigned int norm_maxh(struct em28xx *dev) 
{

	struct em28xx_v4l2 *v4l2 = dev->v4l2;



	if (dev->board.is_webcam)

	if (dev->is_webcam)

		return v4l2->sensor_yres;



	if (dev->board.max_range_640_480)
@@ -176,7 +176,7 @@ static int em28xx_vbi_supported(struct em28xx *dev) 
	if (disable_vbi == 1)

		return 0;



	if (dev->board.is_webcam)

	if (dev->is_webcam)

		return 0;



	/* FIXME: check subdevices for VBI support */
@@ -976,7 +976,7 @@ static void em28xx_v4l2_create_entities(struct em28xx *dev) 
	}



	/* Webcams don't have input connectors */

	if (dev->board.is_webcam)

	if (dev->is_webcam)

		return;



	/* Create entities for each input connector */
@@ -1277,7 +1277,7 @@ static void video_mux(struct em28xx *dev, int index) 
	v4l2_device_call_all(v4l2_dev, 0, video, s_routing,

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



	if (dev->board.has_msp34xx) {

	if (dev->has_msp34xx) {

		if (dev->i2s_speed) {

			v4l2_device_call_all(v4l2_dev, 0, audio,

					     s_i2s_clock_freq, dev->i2s_speed);
@@ -1593,7 +1593,7 @@ static int vidioc_g_parm(struct file *file, void *priv, 


	p->parm.capture.readbuffers = EM28XX_MIN_BUF;

	p->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;

	if (dev->board.is_webcam) {

	if (dev->is_webcam) {

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

						video, g_frame_interval, &ival);

		if (!rc)
@@ -1616,7 +1616,7 @@ static int vidioc_s_parm(struct file *file, void *priv, 
	};

	int rc = 0;



	if (!dev->board.is_webcam)

	if (!dev->is_webcam)

		return -ENOTTY;



	if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
@@ -1655,7 +1655,7 @@ static int vidioc_enum_input(struct file *file, void *priv, 


	i->std = dev->v4l2->vdev.tvnorms;

	/* webcams do not have the STD API */

	if (dev->board.is_webcam)

	if (dev->is_webcam)

		i->capabilities = 0;



	return 0;
@@ -2369,7 +2369,7 @@ static void em28xx_vdev_init(struct em28xx *dev, 
	*vfd		= *template;

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

	vfd->lock	= &dev->lock;

	if (dev->board.is_webcam)

	if (dev->is_webcam)

		vfd->tvnorms = 0;



	snprintf(vfd->name, sizeof(vfd->name), "%s %s",
@@ -2484,7 +2484,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	v4l2_ctrl_handler_init(hdl, 8);

	v4l2->v4l2_dev.ctrl_handler = hdl;



	if (dev->board.is_webcam)

	if (dev->is_webcam)

		v4l2->progressive = true;



	/*
@@ -2496,7 +2496,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 


	/* request some modules */



	if (dev->board.has_msp34xx)

	if (dev->has_msp34xx)

		v4l2_i2c_new_subdev(&v4l2->v4l2_dev,

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

				    "msp3400", 0, msp3400_addrs);
@@ -2585,7 +2585,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	INIT_LIST_HEAD(&dev->vidq.active);

	INIT_LIST_HEAD(&dev->vbiq.active);



	if (dev->board.has_msp34xx) {

	if (dev->has_msp34xx) {

		/* Send a reset to other chips via gpio */

		ret = em28xx_write_reg(dev, EM2820_R08_GPIO_CTRL, 0xf7);

		if (ret < 0) {
@@ -2679,7 +2679,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	v4l2->vdev.queue->lock = &v4l2->vb_queue_lock;



	/* disable inapplicable ioctls */

	if (dev->board.is_webcam) {

	if (dev->is_webcam) {

		v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_QUERYSTD);

		v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_G_STD);

		v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_STD);

drivers/media/usb/em28xx/em28xx.h

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ struct em28xx { 
	unsigned char disconnected:1;	/* device has been diconnected */

	unsigned int has_video:1;

	unsigned int is_audio_only:1;

	unsigned int is_webcam:1;

	unsigned int has_msp34xx:1;

	enum em28xx_int_audio_type int_audio_type;

	enum em28xx_usb_audio_type usb_audio_type;

	unsigned char name[32];