diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-07-09 11:32:30 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-12 23:59:19 +0100 |
| commit | 22564bde0bc4a0ec04d084d3a6c8c75eb2102d57 (patch) | |
| tree | 852abbb9af9a7131ee1a63fb27f2ea6e8af347b9 /arch | |
| parent | ARM: sa11x0: assabet: allow UCB1300 to wake up Assabet (diff) | |
| download | linux-22564bde0bc4a0ec04d084d3a6c8c75eb2102d57.tar.xz linux-22564bde0bc4a0ec04d084d3a6c8c75eb2102d57.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |