From 597a7dd25fb6bb92e6092492ef5f029c3d751d91 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Sat, 3 Nov 2012 11:41:58 +1100 Subject: [PATCH] memstick: ms_block: fix compile issue As suggested by Geert Uytterhoeven: : http://kisskb.ellerman.id.au/kisskb/buildresult/7280352/ : arch/m68k/include/asm/hardirq.h:23:20: error: expected ')' before 'DRIVER_NAME' : make[4]: *** [drivers/memstick/core/ms_block.o] Error 1 : : The reason for this is that pr_fmt() references DRIVER_NAME and is defined : before the first include, while DRIVER_NAME is only defined in ms_block.h, : which is the last included file. If any subsequent include file uses : pr_fmt() (e.g. the call to pr_crit() in arch/m68k/include/asm/hardirq.h), : this causes a build failure. : : I suggest moving the DRIVER_NAME define to ms_block.c. Cfr. memstick.c : and mspro_block.c, who already have their own definition. Signed-off-by: Maxim Levitsky Cc: Geert Uytterhoeven Cc: Alex Dubov Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/core/ms_block.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index c815fe503e63..71e59376c0c3 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -11,7 +11,7 @@ * Copyright (C) 2007 Alex Dubov * */ - +#define DRIVER_NAME "ms_block" #define pr_fmt(fmt) DRIVER_NAME ": " fmt #include diff --git a/drivers/memstick/core/ms_block.h b/drivers/memstick/core/ms_block.h index a2b276519d58..546b55e0e859 100644 --- a/drivers/memstick/core/ms_block.h +++ b/drivers/memstick/core/ms_block.h @@ -277,8 +277,6 @@ static int msb_reset(struct msb_data *msb, bool full); static int h_msb_default_bad(struct memstick_dev *card, struct memstick_request **mrq); -#define DRIVER_NAME "ms_block" - #define __dbg(level, format, ...) \ do { \ if (debug >= level) \ -- 2.39.5