Commit cf9033f9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] radio-tea5764: embed struct video_device 



This simplifies the code as it removes a memory allocation check.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Fabio Belavenuto <belavenuto@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 099f88ee

drivers/media/radio/radio-tea5764.c

+10 −17
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int use_xtal = RADIO_TEA5764_XTAL; 
struct tea5764_device {

	struct v4l2_device v4l2_dev;

	struct i2c_client		*i2c_client;

	struct video_device		*videodev;

	struct video_device		vdev;

	struct tea5764_regs		regs;

	struct mutex			mutex;

};
@@ -303,7 +303,7 @@ static int vidioc_querycap(struct file *file, void *priv, 
					struct v4l2_capability *v)

{

	struct tea5764_device *radio = video_drvdata(file);

	struct video_device *dev = radio->videodev;

	struct video_device *dev = &radio->vdev;



	strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver));

	strlcpy(v->card, dev->name, sizeof(v->card));
@@ -491,7 +491,7 @@ static struct video_device tea5764_radio_template = { 
	.name		= "TEA5764 FM-Radio",

	.fops           = &tea5764_fops,

	.ioctl_ops 	= &tea5764_ioctl_ops,

	.release	= video_device_release,

	.release	= video_device_release_empty,

};



/* I2C probe: check if the device exists and register with v4l if it is */
@@ -528,17 +528,12 @@ static int tea5764_i2c_probe(struct i2c_client *client, 
		goto errunreg;

	}



	radio->videodev = video_device_alloc();

	if (!(radio->videodev)) {

		ret = -ENOMEM;

		goto errunreg;

	}

	*radio->videodev = tea5764_radio_template;

	radio->vdev = tea5764_radio_template;



	i2c_set_clientdata(client, radio);

	video_set_drvdata(radio->videodev, radio);

	radio->videodev->lock = &radio->mutex;

	radio->videodev->v4l2_dev = v4l2_dev;

	video_set_drvdata(&radio->vdev, radio);

	radio->vdev.lock = &radio->mutex;

	radio->vdev.v4l2_dev = v4l2_dev;



	/* initialize and power off the chip */

	tea5764_i2c_read(radio);
@@ -546,16 +541,14 @@ static int tea5764_i2c_probe(struct i2c_client *client, 
	tea5764_mute(radio, 1);

	tea5764_power_down(radio);



	ret = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr);

	ret = video_register_device(&radio->vdev, VFL_TYPE_RADIO, radio_nr);

	if (ret < 0) {

		PWARN("Could not register video device!");

		goto errrel;

		goto errunreg;

	}



	PINFO("registered.");

	return 0;

errrel:

	video_device_release(radio->videodev);

errunreg:

	v4l2_device_unregister(v4l2_dev);

errfr:
@@ -570,7 +563,7 @@ static int tea5764_i2c_remove(struct i2c_client *client) 
	PDEBUG("remove");

	if (radio) {

		tea5764_power_down(radio);

		video_unregister_device(radio->videodev);

		video_unregister_device(&radio->vdev);

		v4l2_device_unregister(&radio->v4l2_dev);

		kfree(radio);

	}