2014-06-30 17:39:13

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1] ia64: use ARRAY_SIZE instead of sizeof/sizeof[0]

Use macro definition

Cc: Jeremy Fitzhardinge <[email protected]>
Cc: Chris Wright <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---

This is untested.

arch/ia64/kernel/paravirt.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/ia64/kernel/paravirt.c b/arch/ia64/kernel/paravirt.c
index 1b22f6d..17bb2d1 100644
--- a/arch/ia64/kernel/paravirt.c
+++ b/arch/ia64/kernel/paravirt.c
@@ -864,8 +864,7 @@ __initdata_or_module =
unsigned long __init_or_module
ia64_native_patch_bundle(void *sbundle, void *ebundle, unsigned long type)
{
- const unsigned long nelems = sizeof(ia64_native_patch_bundle_elems) /
- sizeof(ia64_native_patch_bundle_elems[0]);
+ const unsigned long nelems = ARRAY_SIZE(ia64_native_patch_bundle_elems);

return __paravirt_patch_apply_bundle(sbundle, ebundle, type,
ia64_native_patch_bundle_elems,
@@ -894,9 +893,8 @@ __initconst = {
static void __init
ia64_native_patch_branch(unsigned long tag, unsigned long type)
{
- const unsigned long nelem =
- sizeof(ia64_native_branch_target) /
- sizeof(ia64_native_branch_target[0]);
+ const unsigned long nelem = ARRAY_SIZE(ia64_native_branch_target);
+
__paravirt_patch_apply_branch(tag, type,
ia64_native_branch_target, nelem);
}
--
1.8.4.5