Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1584799 > unrolled thread

[PATCH] Staging: board: Fix macro code style error

Back to article view | Back to linux.kernel

Contents

  [PATCH] Staging: board: Fix macro code style error Valentin Huebner <valentin.huebner@gmail.com> - 2017-02-20 18:50 +0100
    Re: [PATCH] Staging: board: Fix macro code style error Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-20 19:10 +0100
      Re: [PATCH] Staging: board: Fix macro code style error Valentin Hübner <valentin.huebner@gmail.com> - 2017-02-21 16:30 +0100

#1584799 — [PATCH] Staging: board: Fix macro code style error

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 <valentin.huebner@gmail.com>
---
 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

[toc] | [next] | [standalone]

#1584807

On Mon, Feb 20, 2017 at 05:44:50PM +0000, Valentin Huebner wrote:
> Fixes a 'macro with flow control statement' checkpatch code style
> error by removing the board_staging() macro and replacing its two
> calls

checkpatch is wrong here, you are now adding more lines than you remove:

> Signed-off-by: Valentin Hübner <valentin.huebner@gmail.com>
> ---
>  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(-)

See?

There's nothing wrong with the macro as-is, it's like many other macros
we have for module init sequences.  checkpatch is just a hint, you still
have to use your brain :)

sorry,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1585416

On Mon, Feb 20, 2017 at 06:55:06PM +0100, Greg Kroah-Hartman wrote:
> checkpatch is wrong here, you are now adding more lines than you remove:

I see, thank you!

Valentin

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web