[PATCH] Staging: board: Fix redundant macro

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	=?UTF-8?q?Valentin=20H=C3=BCbner?= <valentin.huebner@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] Staging: board: Fix redundant macro
Date	Mon, 20 Feb 2017 10:20:01 +0100
Message-ID	<tcSit-2Lu-1@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=3tfuPi0gn6b0yMQ7/ynMVbaTzqnXlYwpkyTLoB62MwU=; b=TXespaX4GGozk9p3S4ThTP/2t+wAudmXkUBXzK+R8cHJ++I/tZakTnetkHG84fbKha owrP+e39EFjaPF8Oo3BPb9TB0Q0WjiDlfnMUdcstF4ec53yPw5M5mFe5gFszU537ITWr vT4AcGScyQ9mEapvo4Bds5gBo36OzNrEbFQJf1SK5MZdY9ScyA3NyO4YBWdH/9dUEK8X iisWULxcUTowc1FFFl2nbxDxyhe7jwrBzdY8WL06ppeFJF12qULYplQE3dWIDs9d2j5k FQyvwgVD7Biq/sPqoD2x//j8bH4KKD9l2UXXM19ycKZceErCiI1luQKGQxCiv5pHuay7 gfbQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=3tfuPi0gn6b0yMQ7/ynMVbaTzqnXlYwpkyTLoB62MwU=; b=NVKc2iXdha6sXWOkDcg+dGWsJrbgmVaYCnd8VhRNksfm4KbK5vOfJjYu/ZTn8oIcXF FdP+A3FiMsIK7BlIhy5Jg+oNBqg7OTYHGMvh7cxEwaEvXILesFi2OpH2acSFS/gpbElB X2CvgOuB0Z7CvxZmzWC3XzkegGOWXLovHyNoo1TbUxg+0/MVFJyNySMw/0p79g25R4Nw tkX4SRXK0340cjyxqaN8EwmtoslOuRi5v/osrvCNKo4Z452Gu3+YKFFt9FUwDbtBlWNt pKjz1HPGyxBu/PNVXXc/JAGZ2/9iMGXbugFo6NBhE9uJeY7KDQZ8Bt6bG52eskyLpDmK j+VQ==
X-Gm-Message-State	AMke39ngTlDP4uGgzHDIQ3DiADQVz9c9LLw8zudK/bM/bFW1palIZt+BuNMzpjphksNWkw==
X-Received	by 10.223.136.168 with SMTP id f37mr14515424wrf.98.1487581830637; Mon, 20 Feb 2017 01:10:30 -0800 (PST)
MIME-Version	1.0
Content-Type	text/plain; charset=iso-8859-1
Content-Disposition	inline
Content-Transfer-Encoding	8bit
User-Agent	Mutt/1.5.24 (2015-08-30)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	50
Organization	linux.* mail to news gateway
X-Original-Cc	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
X-Original-Date	Mon, 20 Feb 2017 01:10:28 -0800
X-Original-Message-ID	<20170220091028.GA3611@ubuntu>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1584426

Show key headers only | View raw

Fixes a 'macro with flow control statement' checkpatch code style
error by removing the board_staging() macro and replacing its one
and only call

Signed-off-by: Valentin Hübner <valentin.huebner@gmail.com>
---
 drivers/staging/board/armadillo800eva.c | 10 +++++++++-
 drivers/staging/board/board.h           | 11 -----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/board/armadillo800eva.c b/drivers/staging/board/armadillo800eva.c
index 4de4fd0..2f1613a 100644
--- a/drivers/staging/board/armadillo800eva.c
+++ b/drivers/staging/board/armadillo800eva.c
@@ -101,4 +101,12 @@ static void __init armadillo800eva_init(void)
 				       ARRAY_SIZE(armadillo800eva_devices));
 }
 
-board_staging("renesas,armadillo800eva", armadillo800eva_init);
+static int __init runtime_board_check(void)
+{
+	if (of_machine_is_compatible("renesas,armadillo800eva"))
+		armadillo800eva_init();
+
+	return 0;
+}
+
+device_initcall(runtime_board_check)
diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h
index 42ed125..0fa1197 100644
--- a/drivers/staging/board/board.h
+++ b/drivers/staging/board/board.h
@@ -31,15 +31,4 @@ int board_staging_register_device(const struct board_staging_dev *dev);
 void board_staging_register_devices(const struct board_staging_dev *devs,
 				    unsigned int ndevs);
 
-#define board_staging(str, fn)			\
-static int __init runtime_board_check(void)	\
-{						\
-	if (of_machine_is_compatible(str))	\
-		fn();				\
-						\
-	return 0;				\
-}						\
-						\
-device_initcall(runtime_board_check)
-
 #endif /* __BOARD_H__ */
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Staging: board: Fix redundant macro =?UTF-8?q?Valentin=20H=C3=BCbner?=          <valentin.huebner@gmail.com> - 2017-02-20 10:20 +0100
  Re: [PATCH] Staging: board: Fix redundant macro Geert Uytterhoeven <geert@linux-m68k.org> - 2017-02-20 13:50 +0100
  Re: [PATCH] Staging: board: Fix redundant macro kbuild test robot <lkp@intel.com> - 2017-02-20 13:50 +0100

csiph-web