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

Commit 9bd766b7 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] iguanair: simplify calculation of carrier delay cycles 



Simplify the logic that	calculates the carrier,	and removes a warning
on avr32 arch:
        drivers/media/rc/iguanair.c: In function 'iguanair_set_tx_carrier':
        drivers/media/rc/iguanair.c:304: warning: 'sevens' may be used uninitialized in this function

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Reviewed-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 5f27ca41

drivers/media/rc/iguanair.c

+6 −16
Original line number Diff line number Diff line
@@ -308,22 +308,12 @@ static int iguanair_set_tx_carrier(struct rc_dev *dev, uint32_t carrier) 
		cycles = DIV_ROUND_CLOSEST(24000000, carrier * 2) -

							ir->cycle_overhead;



		/*  make up the the remainer of 4-cycle blocks */

		switch (cycles & 3) {

		case 0:

			sevens = 0;

			break;

		case 1:

			sevens = 3;

			break;

		case 2:

			sevens = 2;

			break;

		case 3:

			sevens = 1;

			break;

		}



		/*

		 * Calculate minimum number of 7 cycles needed so

		 * we are left with a multiple of 4; so we want to have

		 * (sevens * 7) & 3 == cycles & 3

		 */

		sevens = (4 - cycles) & 3;

		fours = (cycles - sevens * 7) / 4;



		/* magic happens here */