From patchwork Wed Dec 24 05:38:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 423851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 79276140081 for ; Wed, 24 Dec 2014 16:38:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750891AbaLXFip (ORCPT ); Wed, 24 Dec 2014 00:38:45 -0500 Received: from smtp.mei.co.jp ([133.183.100.20]:42762 "EHLO smtp.mei.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750746AbaLXFio (ORCPT ); Wed, 24 Dec 2014 00:38:44 -0500 Received: from mail-gw.jp.panasonic.com ([157.8.1.157]) by smtp.mei.co.jp (8.12.11.20060614/3.7W/kc-maile11) with ESMTP id sBO5cZdD000207; Wed, 24 Dec 2014 14:38:35 +0900 (JST) Received: from epochmail.jp.panasonic.com ([157.8.1.130]) by mail.jp.panasonic.com (8.11.6p2/3.7W/kc-maili13) with ESMTP id sBO5cZJ26566; Wed, 24 Dec 2014 14:38:35 +0900 Received: by epochmail.jp.panasonic.com (8.12.11.20060308/3.7W/lomi17) id sBO5cZqV010571; Wed, 24 Dec 2014 14:38:35 +0900 Received: from poodle by lomi17.jp.panasonic.com (8.12.11.20060308/3.7W) with ESMTP id sBO5cYIb010531; Wed, 24 Dec 2014 14:38:34 +0900 Received: from beagle.diag.org (beagle.diag.org [10.184.179.16]) by poodle (Postfix) with ESMTP id CDF332743A5C; Wed, 24 Dec 2014 14:38:34 +0900 (JST) From: Masahiro Yamada To: linux-kernel@vger.kernel.org, Andrew Morton Cc: Masahiro Yamada , Eric Miao , Haojian Zhuang , Russell King , Daniel Mack , Robert Jarzmik , Linus Walleij , Steven Rostedt , Rusty Russell , Michal Nazarewicz , Ingo Molnar , Peter Zijlstra , Joe Perches , Daniel Borkmann , Alex Elder , Daniel Walter , Peter Hurley , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org Subject: [PATCH] linux/kernel.h: merge ARRAY_AND_SIZE defines Date: Wed, 24 Dec 2014 14:38:16 +0900 Message-Id: <1419399496-5955-1-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.9.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org ARRAY_AND_SIZE is a useful macro. Its definition is already duplicated in some headers. Move it to include/linux/kernel.h. Signed-off-by: Masahiro Yamada --- arch/arm/mach-mmp/common.h | 1 - arch/arm/mach-pxa/generic.h | 2 -- arch/arm/mach-ux500/db8500-regs.h | 2 -- drivers/pinctrl/pinctrl-lantiq.h | 2 -- include/linux/kernel.h | 1 + 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index cf445ba..e503f63 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -1,5 +1,4 @@ #include -#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) extern void timer_init(int irq); diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 7a9fa1a..da11977 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -23,8 +23,6 @@ extern void pxa_timer_init(void); mi->bank[__nr].start = (__start), \ mi->bank[__nr].size = (__size) -#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) - #define pxa25x_handle_irq icip_handle_irq extern void __init pxa25x_init_irq(void); extern void __init pxa25x_map_io(void); diff --git a/arch/arm/mach-ux500/db8500-regs.h b/arch/arm/mach-ux500/db8500-regs.h index 2739955..80a6deb 100644 --- a/arch/arm/mach-ux500/db8500-regs.h +++ b/arch/arm/mach-ux500/db8500-regs.h @@ -195,6 +195,4 @@ /* Used by some plat-nomadik code */ #define io_p2v(n) __io_address(n) -#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) - #endif diff --git a/drivers/pinctrl/pinctrl-lantiq.h b/drivers/pinctrl/pinctrl-lantiq.h index c7cfad5..508d205 100644 --- a/drivers/pinctrl/pinctrl-lantiq.h +++ b/drivers/pinctrl/pinctrl-lantiq.h @@ -21,8 +21,6 @@ #include "core.h" -#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) - #define LTQ_MAX_MUX 4 #define MFPR_FUNC_MASK 0x3 diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 049d43b..4e8fc3d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -59,6 +59,7 @@ void printch(int c); #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) +#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) /* * This looks more complex than it should be. But we need to