tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Joonyoung Shim <jy0922.shim@samsung.com>
Acked-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Tobias Lorenz and committed by
Mauro Carvalho Chehab 186a21cb 131ddd1a

-6
-6
drivers/media/radio/si470x/radio-si470x-common.c
··· 688 688 /* driver constants */ 689 689 strcpy(tuner->name, "FM"); 690 690 tuner->type = V4L2_TUNER_RADIO; 691 - #if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) 692 691 tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | 693 692 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO; 694 - #else 695 - tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; 696 - #endif 697 693 698 694 /* range limits */ 699 695 switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) { ··· 715 719 tuner->rxsubchans = V4L2_TUNER_SUB_MONO; 716 720 else 717 721 tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; 718 - #if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) 719 722 /* If there is a reliable method of detecting an RDS channel, 720 723 then this code should check for that before setting this 721 724 RDS subchannel. */ 722 725 tuner->rxsubchans |= V4L2_TUNER_SUB_RDS; 723 - #endif 724 726 725 727 /* mono/stereo selector */ 726 728 if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)