summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-07-30 12:37:35 +0200
committerOlof Johansson <olof@lixom.net>2014-07-31 07:58:54 +0200
commitfc5130de8309727540de7cae0199764af34b0919 (patch)
treea457c2d156be3963dbdb66b45df11fc3a0bea517 /drivers
parentMerge tag 'omap-for-v3.17/fixes-not-urgent-signed' of git://git.kernel.org/pu... (diff)
downloadlinux-fc5130de8309727540de7cae0199764af34b0919.tar.xz
linux-fc5130de8309727540de7cae0199764af34b0919.zip
drivers: CCI: Correct use of ! and &
In commit ae91d60ba88ef0bdb1b5e9b2363bd52fc45d2af7, a bug was fixed that involved converting !x & y to !(x & y). The code below shows the same pattern, and thus should perhaps be fixed in the same way. The Coccinelle semantic patch that makes this change is as follows: // <smpl> @@ expression E1,E2; @@ ( !E1 & !E2 | - !E1 & E2 + !(E1 & E2) ) // </smpl> Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Acked-by: Punit Agrawal <punit.agrawal@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bus/arm-cci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 5a86da97a70b..7af78df241f2 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
hw_counter = &event->hw;
/* Did this counter overflow? */
- if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
+ if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
+ CCI_PMU_OVRFLW_FLAG))
continue;
pmu_write_register(CCI_PMU_OVRFLW_FLAG, idx, CCI_PMU_OVRFLW);