|
|
@@ -179,7 +179,6 @@
|
|
|
#define BCM2048_DEFAULT_TIMEOUT 1500
|
|
|
#define BCM2048_AUTO_SEARCH_TIMEOUT 3000
|
|
|
|
|
|
-
|
|
|
#define BCM2048_FREQDEV_UNIT 10000
|
|
|
#define BCM2048_FREQV4L2_MULTI 625
|
|
|
#define dev_to_v4l2(f) ((f * BCM2048_FREQDEV_UNIT) / BCM2048_FREQV4L2_MULTI)
|
|
|
@@ -1436,10 +1435,8 @@ static void bcm2048_parse_rds_pi(struct bcm2048_device *bdev)
|
|
|
u16 pi;
|
|
|
|
|
|
for (i = 0; i < bdev->fifo_size; i += BCM2048_RDS_FIFO_DUPLE_SIZE) {
|
|
|
-
|
|
|
/* Block A match, only data without crc errors taken */
|
|
|
if (bdev->rds_info.radio_text[i] == BCM2048_RDS_BLOCK_A) {
|
|
|
-
|
|
|
pi = (bdev->rds_info.radio_text[i + 1] << 8) +
|
|
|
bdev->rds_info.radio_text[i + 2];
|
|
|
|
|
|
@@ -1495,7 +1492,6 @@ static int bcm2048_parse_rt_match_b(struct bcm2048_device *bdev, int i)
|
|
|
|
|
|
if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) ==
|
|
|
BCM2048_RDS_BLOCK_B) {
|
|
|
-
|
|
|
rt_id = bdev->rds_info.radio_text[i + 1] &
|
|
|
BCM2048_RDS_BLOCK_MASK;
|
|
|
rt_group_b = bdev->rds_info.radio_text[i + 1] &
|
|
|
@@ -1577,7 +1573,6 @@ static void bcm2048_parse_rds_rt(struct bcm2048_device *bdev)
|
|
|
int i, index = 0, crc, match_b = 0, match_c = 0, match_d = 0;
|
|
|
|
|
|
for (i = 0; i < bdev->fifo_size; i += BCM2048_RDS_FIFO_DUPLE_SIZE) {
|
|
|
-
|
|
|
if (match_b) {
|
|
|
match_b = 0;
|
|
|
index = bcm2048_parse_rt_match_b(bdev, i);
|
|
|
@@ -1714,7 +1709,6 @@ static void bcm2048_parse_rds_ps(struct bcm2048_device *bdev)
|
|
|
int i, index = 0, crc, match_b = 0, match_c = 0, match_d = 0;
|
|
|
|
|
|
for (i = 0; i < bdev->fifo_size; i += BCM2048_RDS_FIFO_DUPLE_SIZE) {
|
|
|
-
|
|
|
if (match_b) {
|
|
|
match_b = 0;
|
|
|
index = bcm2048_parse_ps_match_b(bdev, i);
|
|
|
@@ -1911,7 +1905,6 @@ static void bcm2048_work(struct work_struct *work)
|
|
|
|
|
|
if (flag_lsb & (BCM2048_FM_FLAG_SEARCH_TUNE_FINISHED |
|
|
|
BCM2048_FM_FLAG_SEARCH_TUNE_FAIL)) {
|
|
|
-
|
|
|
if (flag_lsb & BCM2048_FM_FLAG_SEARCH_TUNE_FAIL)
|
|
|
bdev->scan_state = BCM2048_SCAN_FAIL;
|
|
|
else
|
|
|
@@ -2165,7 +2158,6 @@ static int bcm2048_sysfs_register_properties(struct bcm2048_device *bdev)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static int bcm2048_fops_open(struct file *file)
|
|
|
{
|
|
|
struct bcm2048_device *bdev = video_drvdata(file);
|