lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] rpc: acornscsi: stop using private __stringify()

Browse Source 
The kernel has its own, so let's use that instead.

Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2008-04-19 15:37:44 +01:00
committed by Russell King
parent ffd7858dd8
commit a796ef7035
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/arm/acornscsi.c
View File

@@ -123,12 +123,6 @@
#define DBG(cmd,xxx...) xxx #define DBG(cmd,xxx...) xxx
#endif #endif
#ifndef STRINGIFY
#define STRINGIFY(x) #x
#endif
#define STRx(x) STRINGIFY(x)
#define NO_WRITE_STR STRx(NO_WRITE)
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
@@ -141,6 +135,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/stringify.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
@@ -2828,7 +2823,7 @@ char *acornscsi_info(struct Scsi_Host *host)
" LINK" " LINK"
#endif #endif
#if (DEBUG & DEBUG_NO_WRITE) #if (DEBUG & DEBUG_NO_WRITE)
" NOWRITE ("NO_WRITE_STR")" " NOWRITE (" __stringify(NO_WRITE) ")"
#endif #endif
, host->hostt->name, host->io_port, host->irq, , host->hostt->name, host->io_port, host->irq,
VER_MAJOR, VER_MINOR, VER_PATCH); VER_MAJOR, VER_MINOR, VER_PATCH);
@@ -2859,7 +2854,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
" LINK" " LINK"
#endif #endif
#if (DEBUG & DEBUG_NO_WRITE) #if (DEBUG & DEBUG_NO_WRITE)
" NOWRITE ("NO_WRITE_STR")" " NOWRITE (" __stringify(NO_WRITE) ")"
#endif #endif
"\n\n", VER_MAJOR, VER_MINOR, VER_PATCH); "\n\n", VER_MAJOR, VER_MINOR, VER_PATCH);