From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbdBTRo4 (ORCPT ); Mon, 20 Feb 2017 12:44:56 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34845 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbdBTRoy (ORCPT ); Mon, 20 Feb 2017 12:44:54 -0500 Date: Mon, 20 Feb 2017 17:44:50 +0000 From: Valentin Huebner To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] Staging: board: Fix macro code style error Message-ID: <20170220174450.GA106887@ubuntu> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes a 'macro with flow control statement' checkpatch code style error by removing the board_staging() macro and replacing its two calls Signed-off-by: Valentin Hübner --- drivers/staging/board/armadillo800eva.c | 10 +++++++++- drivers/staging/board/board.h | 11 ----------- drivers/staging/board/kzm9d.c | 10 +++++++++- 3 files changed, 18 insertions(+), 13 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__ */ diff --git a/drivers/staging/board/kzm9d.c b/drivers/staging/board/kzm9d.c index 05a6d43..662501c 100644 --- a/drivers/staging/board/kzm9d.c +++ b/drivers/staging/board/kzm9d.c @@ -22,4 +22,12 @@ static void __init kzm9d_init(void) } } -board_staging("renesas,kzm9d", kzm9d_init); +static int __init runtime_board_check(void) +{ + if (of_machine_is_compatible("renesas,kzm9d")) + kzm9d_init(); + + return 0; +} + +device_initcall(runtime_board_check) -- 2.7.4