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

Commit 186a21cb authored by Tobias Lorenz's avatar Tobias Lorenz Committed by Mauro Carvalho Chehab
Browse files

[media] radio-si470x: Always report support for RDS 



The si470x i2c and usb driver support the RDS, so this ifdef statement
doesn't need more.

[mchehab@redhat.com: Fix a conflict on it]
Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Acked-by: default avatarTobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 131ddd1a

drivers/media/radio/si470x/radio-si470x-common.c

+0 −6
Original line number Diff line number Diff line
@@ -688,12 +688,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, 
	/* driver constants */

	strcpy(tuner->name, "FM");

	tuner->type = V4L2_TUNER_RADIO;

#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)

	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;

#else

	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;

#endif



	/* range limits */

	switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
@@ -719,12 +715,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, 
		tuner->rxsubchans = V4L2_TUNER_SUB_MONO;

	else

		tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;

#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)

	/* If there is a reliable method of detecting an RDS channel,

	   then this code should check for that before setting this

	   RDS subchannel. */

	tuner->rxsubchans |= V4L2_TUNER_SUB_RDS;

#endif



	/* mono/stereo selector */

	if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)