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

Commit 6994ca3d authored by Ondrej Zary's avatar Ondrej Zary Committed by Mauro Carvalho Chehab
Browse files

[media] tea575x: split and export functions 



Split ioctl interface from enum_freq_bands, g_tuner and s_hw_freq_seek
functions and export them to be used in other drivers like bttv.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1b500373

drivers/media/radio/tea575x.c

+32 −9
Original line number Diff line number Diff line
@@ -247,10 +247,9 @@ static int vidioc_querycap(struct file *file, void *priv, 
	return 0;

}



static int vidioc_enum_freq_bands(struct file *file, void *priv,

int snd_tea575x_enum_freq_bands(struct snd_tea575x *tea,

					struct v4l2_frequency_band *band)

{

	struct snd_tea575x *tea = video_drvdata(file);

	int index;



	if (band->tuner != 0)
@@ -279,18 +278,25 @@ static int vidioc_enum_freq_bands(struct file *file, void *priv, 


	return 0;

}

EXPORT_SYMBOL(snd_tea575x_enum_freq_bands);



static int vidioc_g_tuner(struct file *file, void *priv,

					struct v4l2_tuner *v)

static int vidioc_enum_freq_bands(struct file *file, void *priv,

					 struct v4l2_frequency_band *band)

{

	struct snd_tea575x *tea = video_drvdata(file);



	return snd_tea575x_enum_freq_bands(tea, band);

}



int snd_tea575x_g_tuner(struct snd_tea575x *tea, struct v4l2_tuner *v)

{

	struct v4l2_frequency_band band_fm = { 0, };



	if (v->index > 0)

		return -EINVAL;



	snd_tea575x_read(tea);

	vidioc_enum_freq_bands(file, priv, &band_fm);

	snd_tea575x_enum_freq_bands(tea, &band_fm);



	memset(v, 0, sizeof(*v));

	strlcpy(v->name, tea->has_am ? "FM/AM" : "FM", sizeof(v->name));
@@ -304,6 +310,15 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	v->signal = tea->tuned ? 0xffff : 0;

	return 0;

}

EXPORT_SYMBOL(snd_tea575x_g_tuner);



static int vidioc_g_tuner(struct file *file, void *priv,

					struct v4l2_tuner *v)

{

	struct snd_tea575x *tea = video_drvdata(file);



	return snd_tea575x_g_tuner(tea, v);

}



static int vidioc_s_tuner(struct file *file, void *priv,

					const struct v4l2_tuner *v)
@@ -356,10 +371,9 @@ static int vidioc_s_frequency(struct file *file, void *priv, 
	return 0;

}



static int vidioc_s_hw_freq_seek(struct file *file, void *fh,

int snd_tea575x_s_hw_freq_seek(struct file *file, struct snd_tea575x *tea,

				const struct v4l2_hw_freq_seek *a)

{

	struct snd_tea575x *tea = video_drvdata(file);

	unsigned long timeout;

	int i, spacing;
@@ -442,6 +456,15 @@ static int vidioc_s_hw_freq_seek(struct file *file, void *fh, 
	snd_tea575x_set_freq(tea);

	return -ENODATA;

}

EXPORT_SYMBOL(snd_tea575x_s_hw_freq_seek);



static int vidioc_s_hw_freq_seek(struct file *file, void *fh,

					const struct v4l2_hw_freq_seek *a)

{

	struct snd_tea575x *tea = video_drvdata(file);



	return snd_tea575x_s_hw_freq_seek(file, tea, a);

}



static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)

{

include/media/tea575x.h

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ struct snd_tea575x { 
	int (*ext_init)(struct snd_tea575x *tea);

};



int snd_tea575x_enum_freq_bands(struct snd_tea575x *tea,

					struct v4l2_frequency_band *band);

int snd_tea575x_g_tuner(struct snd_tea575x *tea, struct v4l2_tuner *v);

int snd_tea575x_s_hw_freq_seek(struct file *file, struct snd_tea575x *tea,

				const struct v4l2_hw_freq_seek *a);

int snd_tea575x_hw_init(struct snd_tea575x *tea);

int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner);

void snd_tea575x_exit(struct snd_tea575x *tea);