[media] tlg2300: embed video_device instead of allocating it (6fef4907) · Commits · 戴 / test

drivers/media/usb/tlg2300/pd-common.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ struct radio_data {
		int users;
		unsigned int is_radio_streaming;
		int pre_emphasis;
		struct video_device *fm_dev;
		struct video_device fm_dev;
		};

		#define DVB_SBUF_NUM 4

+6 −14

Original line number	Diff line number	Diff line
		@@ -369,31 +369,23 @@ static struct video_device poseidon_fm_template = {
		.name = "Telegent-Radio",
		.fops = &poseidon_fm_fops,
		.minor = -1,
		.release = video_device_release,
		.release = video_device_release_empty,
		.ioctl_ops = &poseidon_fm_ioctl_ops,
		};

		int poseidon_fm_init(struct poseidon *p)
		{
		struct video_device *fm_dev;
		int err;
		struct video_device *vfd = &p->radio_data.fm_dev;

		fm_dev = vdev_init(p, &poseidon_fm_template);
		if (fm_dev == NULL)
		return -ENOMEM;
		*vfd = poseidon_fm_template;
		vfd->v4l2_dev = &p->v4l2_dev;
		video_set_drvdata(vfd, p);

		p->radio_data.fm_dev = fm_dev;
		set_frequency(p, TUNER_FREQ_MIN_FM);
		err = video_register_device(fm_dev, VFL_TYPE_RADIO, -1);
		if (err < 0) {
		video_device_release(fm_dev);
		return err;
		}
		return 0;
		return video_register_device(vfd, VFL_TYPE_RADIO, -1);
		}

		int poseidon_fm_exit(struct poseidon *p)
		{
		destroy_video_device(&p->radio_data.fm_dev);
		return 0;
		}