OSDN Git Service

arm64: vdso: simplify arch_vdso_type ifdeffery
authorMark Rutland <mark.rutland@arm.com>
Tue, 28 Apr 2020 16:49:19 +0000 (17:49 +0100)
committerWill Deacon <will@kernel.org>
Wed, 29 Apr 2020 09:52:53 +0000 (10:52 +0100)
commit3ee16ff3437ca5388d8b60a122fde94f896f50d3
tree9f9ae533c48c525f920ea038b1141cd2308067c3
parent74fc72e77dc5c8033d1b47d2c8a7229b4b83a746
arm64: vdso: simplify arch_vdso_type ifdeffery

Currently we have some ifdeffery to determine the number of elements in
enum arch_vdso_type as VDSO_TYPES, rather that the usual pattern of
having the enum define this:

| enum foo_type {
|         FOO_TYPE_A,
|         FOO_TYPE_B,
| #ifdef CONFIG_C
|         FOO_TYPE_C,
| #endif
|         NR_FOO_TYPES
| }

... however, given we only use this number to size the vdso_lookup[]
array, this is redundant anyway as the compiler can automatically size
the array to fit all defined elements.

So let's remove the VDSO_TYPES to simplify the code.

At the same time, let's use designated initializers for the array
elements so that these are guarnateed to be at the expected indices,
regardless of how we modify the structure. For clariy the redundant
explicit initialization of the enum elements is dropped.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200428164921.41641-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/vdso.c