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

Commit e4e56f69 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio: RTC6226: avoid unnecessary logging while RDS interrupt handling"

parents 069f7c58 abbe1624

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

+1 −5
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ int rtc6226_stop(struct rtc6226_device *radio) 
static void rtc6226_get_rds(struct rtc6226_device *radio)

{

	int retval = 0;

	int i;



	mutex_lock(&radio->lock);

	retval = rtc6226_get_all_registers(radio);
@@ -627,9 +626,6 @@ static void rtc6226_get_rds(struct rtc6226_device *radio) 
	radio->block[2] = radio->registers[BC_DATA];

	radio->block[3] = radio->registers[BD_DATA];



	for (i = 0; i < 4; i++)

		FMDBG("%s block[%d] %x\n", __func__, i, radio->block[i]);



	radio->bler[0] = (radio->registers[RSSI] & RSSI_RDS_BA_ERRS) >> 14;

	radio->bler[1] = (radio->registers[RSSI] & RSSI_RDS_BB_ERRS) >> 12;

	radio->bler[2] = (radio->registers[RSSI] & RSSI_RDS_BC_ERRS) >> 10;
@@ -1244,7 +1240,7 @@ void rtc6226_rds_handler(struct work_struct *worker) 
		grp_type = radio->block[1] >> OFFSET_OF_GRP_TYP;

		FMDBG("%s grp_type = %d\n", __func__, grp_type);

	} else {

		FMDBG("%s invalid data %d\n", __func__, radio->bler[1]);

		/* invalid data case */

		return;

	}

	if (grp_type & 0x01)

drivers/media/radio/rtc6226/radio-rtc6226-i2c.c

+9 −9
Original line number Diff line number Diff line
@@ -236,7 +236,10 @@ static void rtc6226_i2c_interrupt_handler(struct rtc6226_device *radio) 
		FMDERR("%s read fail to STATUS\n", __func__);

		goto end;

	}

	FMDBG("%s : STATUS=0x%4.4hx\n", __func__, radio->registers[STATUS]);



	if (radio->registers[STATUS] & STATUS_STD) {

		FMDBG("%s : STATUS=0x%4.4hx\n", __func__,

				radio->registers[STATUS]);



		retval = rtc6226_get_register(radio, RSSI);

		if (retval < 0) {
@@ -244,8 +247,6 @@ static void rtc6226_i2c_interrupt_handler(struct rtc6226_device *radio) 
			goto end;

		}

		FMDBG("%s : RSSI=0x%4.4hx\n", __func__, radio->registers[RSSI]);



	if (radio->registers[STATUS] & STATUS_STD) {

			/* stop seeking : clear STD*/

		radio->registers[SEEKCFG1] &= ~SEEKCFG1_CSR0_SEEK;

		retval = rtc6226_set_register(radio, SEEKCFG1);
@@ -294,7 +295,6 @@ static void rtc6226_i2c_interrupt_handler(struct rtc6226_device *radio) 
			/* avoid RDS interrupt lock disable_irq*/

			if ((radio->registers[SYSCFG] &

						SYSCFG_CSR0_RDS_EN) != 0) {

				FMDBG("%s start rds handler\n", __func__);

				schedule_work(&radio->rds_worker);

			}

		}