Staging: board: Fix redundant macro
PATCH 1/1 Staging: board: Fix redundant macro
Fixes a 'macro with flow control statement' checkpatch code style error by removing the board_staging() macro and replacing its one and only call
--- drivers/staging/board/armadillo800eva.c | 10 +++++++++- drivers/staging/board/board.h | 11 ----------- 2 files changed, 9 insertions(+), 12 deletions(-)
drivers/staging/board/armadillo800eva.c +9 -1
@@ -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)
drivers/staging/board/board.h +0 -11
@@ -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__ */
Signature · 1 line
2.7.4
kbuild test robot
build boturl: https://github.com/0day-ci/linux/commits/UTF-8-q-Valentin-20H-C3-BCbner/Staging-board-Fix-redundant-macro/20170220-175655 config: arm-shmobile_defconfig (attached as .config) compiler…
Hi
[auto build test ERROR on staging/staging-testing]
[also build test ERROR on v4.10 next-20170220]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/UTF-8-q-Valentin-20H-C3-BCbner/Staging-board-Fix-redundant-macro/20170220-175655
config: arm-shmobile_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
>> drivers/staging/board/kzm9d.c:25:15: error: expected declaration specifiers or '...' before string constant
board_staging("renesas,kzm9d", kzm9d_init);
^~~~~~~~~~~~~~~
>> drivers/staging/board/kzm9d.c:25:32: error: expected declaration specifiers or '...' before 'kzm9d_init'
board_staging("renesas,kzm9d", kzm9d_init);
^~~~~~~~~~ drivers/staging/board/kzm9d.c:12:20: warning: 'kzm9d_init' defined but not used [-Wunused-function]
static void __init kzm9d_init(void)
^~~~~~~~~~
vim +25 drivers/staging/board/kzm9d.c
f22f4ea5 Magnus Damm 2014-06-06 9 DEFINE_RES_IRQ(159),
f22f4ea5 Magnus Damm 2014-06-06 10 };
f22f4ea5 Magnus Damm 2014-06-06 11
f22f4ea5 Magnus Damm 2014-06-06 12 static void __init kzm9d_init(void)
f22f4ea5 Magnus Damm 2014-06-06 13 {
cebbddb6 Geert Uytterhoeven 2015-11-20 14 board_staging_gic_setup_xlate("arm,pl390", 32);
a8589088 Geert Uytterhoeven 2015-06-17 15
a8589088 Geert Uytterhoeven 2015-06-17 16 if (!board_staging_dt_node_available(usbs1_res,
a8589088 Geert Uytterhoeven 2015-06-17 17 ARRAY_SIZE(usbs1_res))) {
a8589088 Geert Uytterhoeven 2015-06-17 18 board_staging_gic_fixup_resources(usbs1_res,
a8589088 Geert Uytterhoeven 2015-06-17 19 ARRAY_SIZE(usbs1_res));
f22f4ea5 Magnus Damm 2014-06-06 20 platform_device_register_simple("emxx_udc", -1, usbs1_res,
f22f4ea5 Magnus Damm 2014-06-06 21 ARRAY_SIZE(usbs1_res));
f22f4ea5 Magnus Damm 2014-06-06 22 }
a8589088 Geert Uytterhoeven 2015-06-17 23 }
f22f4ea5 Magnus Damm 2014-06-06 24 f22f4ea5 Magnus Damm 2014-06-06 @25 board_staging("renesas,kzm9d", kzm9d_init);
:::::: The code at line 25 was first introduced by commit
:::::: f22f4ea5c63fbc6ee7a3f7240c84a276eba96d76 staging: board: kzm9d: Board staging support for emxx_udc
:::::: TO: Magnus Damm <[email protected]> :::::: CC: Greg Kroah-Hartman <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 3 lines · On Mon, Feb 20, 2017 at 10:10 AM, =?UTF-8?q?Valentin=20H=C3=BCbner?=…
Fixes a 'macro with flow control statement' checkpatch code style error by removing the
board_staging()macro and replacing its one and only call
It's not the only user, as 0day has already told you.
Quoted 1 line
Signed-off-by Valentin Hübner <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds