aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-11 20:10:53 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-05-27 19:37:48 -0400
commit0aeee5d4f6aa9bd28373907727937b7935d0434c (patch)
treef8a12ef8c994860468d1b8b6b7ea50e3b5156441
parente4be3cb72ce40482a9fe19210ad5de8bfc061bb5 (diff)
mfd: Fix pcf50633 bitfield logic in interrupt handler
Those constants are alreay bitfields. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/pcf50633-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 5439282804cc..37618b2be9a2 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -354,18 +354,18 @@ static void pcf50633_irq_worker(struct work_struct *work)
354 if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) { 354 if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
355 chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2); 355 chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
356 if (chgstat & (0x3 << 4)) 356 if (chgstat & (0x3 << 4))
357 pcf_int[0] &= ~(1 << PCF50633_INT1_USBREM); 357 pcf_int[0] &= ~PCF50633_INT1_USBREM;
358 else 358 else
359 pcf_int[0] &= ~(1 << PCF50633_INT1_USBINS); 359 pcf_int[0] &= ~PCF50633_INT1_USBINS;
360 } 360 }
361 361
362 /* Make sure only one of ADPINS or ADPREM is set */ 362 /* Make sure only one of ADPINS or ADPREM is set */
363 if (pcf_int[0] & (PCF50633_INT1_ADPINS | PCF50633_INT1_ADPREM)) { 363 if (pcf_int[0] & (PCF50633_INT1_ADPINS | PCF50633_INT1_ADPREM)) {
364 chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2); 364 chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
365 if (chgstat & (0x3 << 4)) 365 if (chgstat & (0x3 << 4))
366 pcf_int[0] &= ~(1 << PCF50633_INT1_ADPREM); 366 pcf_int[0] &= ~PCF50633_INT1_ADPREM;
367 else 367 else
368 pcf_int[0] &= ~(1 << PCF50633_INT1_ADPINS); 368 pcf_int[0] &= ~PCF50633_INT1_ADPINS;
369 } 369 }
370 370
371 dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x " 371 dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x "