Skip to content

Commit

Permalink
Merge tag 'vexpress-update-5.4' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/kernel/git/sudeep.holla/linux into arm/soc

ARMv7 Vexpress update for v5.4

Single cleanup patch handling type checks using cppcheck tool
(bitwise shift by more than 31 on a 32 bit type)

* tag 'vexpress-update-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  ARM: vexpress: Cleanup cppcheck shifting warning

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
  • Loading branch information
arndb committed Sep 3, 2019
2 parents d64a1fd + ace4682 commit 98d8684
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-vexpress/spc.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#define A7_PERFVAL_BASE 0xC30

/* Config interface control bits */
#define SYSCFG_START (1 << 31)
#define SYSCFG_START BIT(31)
#define SYSCFG_SCC (6 << 20)
#define SYSCFG_STAT (14 << 20)

Expand Down Expand Up @@ -162,7 +162,7 @@ void ve_spc_cpu_wakeup_irq(u32 cluster, u32 cpu, bool set)
if (cluster >= MAX_CLUSTERS)
return;

mask = 1 << cpu;
mask = BIT(cpu);

if (!cluster_is_a15(cluster))
mask <<= 4;
Expand Down

0 comments on commit 98d8684

Please sign in to comment.