From 22564bde0bc4a0ec04d084d3a6c8c75eb2102d57 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 9 Jul 2013 10:32:30 +0100 Subject: ARM: sa11x0: assabet: clean up IrDA power setting Minor clean up to the IrDA power setting support. Signed-off-by: Russell King --- arch/arm/mach-sa1100/assabet.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index fc840f62dfd..8443a27bca2 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; } -- cgit v1.2.3