Re: [PATCH 2/2] memstick: add support for legacy memorysticks
From: Maxim Levitsky <maximlevitsky@gmail.com>
Date: 2012-10-01 20:24:30
Also in:
lkml
On Sat, 2012-09-29 at 19:20 +0200, Geert Uytterhoeven wrote:
On Wed, Sep 26, 2012 at 11:49 AM, Maxim Levitsky [off-list ref] wrote:quoted
--- /dev/null +++ b/drivers/memstick/core/ms_block.cquoted
+#define pr_fmt(fmt) DRIVER_NAME ": " fmt + +#include <linux/module.h> +#include <linux/blkdev.h> +#include <linux/memstick.h> +#include <linux/idr.h> +#include <linux/hdreg.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/random.h> +#include <linux/bitmap.h> +#include <linux/scatterlist.h> +#include <linux/jiffies.h> +#include <linux/workqueue.h> +#include <linux/mutex.h> +#include "ms_block.h"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. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org 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
Completely agree! I was somewhat busy lately, so I didn't address this yet. I'll send a patch tomorrow. Best regards, Maxim Levitsky