From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 9 Jul 2013 09:32:30 +0000 (+0100)
Subject: ARM: sa11x0: assabet: clean up IrDA power setting
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22564bde0bc4a0ec04d084d3a6c8c75eb2102d57;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

ARM: sa11x0: assabet: clean up IrDA power setting

Minor clean up to the IrDA power setting support.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index fc840f62dfda..8443a27bca2f 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -286,12 +286,9 @@ static int assabet_irda_set_power(struct device *dev, unsigned int state)
 		0
 	};
 
-	if (state < 4) {
-		state = bcr_state[state];
-		ASSABET_BCR_clear(state ^ (ASSABET_BCR_IRDA_MD1|
-					   ASSABET_BCR_IRDA_MD0));
-		ASSABET_BCR_set(state);
-	}
+	if (state < 4)
+		ASSABET_BCR_frob(ASSABET_BCR_IRDA_MD1 | ASSABET_BCR_IRDA_MD0,
+				 bcr_state[state]);
 	return 0;
 }