Skip to content

Commit a796ef7

Browse files
Russell KingRussell King
authored andcommitted
[ARM] rpc: acornscsi: stop using private __stringify()
The kernel has its own, so let's use that instead. Acked-by: James Bottomley <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent ffd7858 commit a796ef7

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

drivers/scsi/arm/acornscsi.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
#define DBG(cmd,xxx...) xxx
124124
#endif
125125

126-
#ifndef STRINGIFY
127-
#define STRINGIFY(x) #x
128-
#endif
129-
#define STRx(x) STRINGIFY(x)
130-
#define NO_WRITE_STR STRx(NO_WRITE)
131-
132126
#include <linux/module.h>
133127
#include <linux/kernel.h>
134128
#include <linux/string.h>
@@ -141,6 +135,7 @@
141135
#include <linux/interrupt.h>
142136
#include <linux/init.h>
143137
#include <linux/bitops.h>
138+
#include <linux/stringify.h>
144139

145140
#include <asm/system.h>
146141
#include <asm/io.h>
@@ -2828,7 +2823,7 @@ char *acornscsi_info(struct Scsi_Host *host)
28282823
" LINK"
28292824
#endif
28302825
#if (DEBUG & DEBUG_NO_WRITE)
2831-
" NOWRITE ("NO_WRITE_STR")"
2826+
" NOWRITE (" __stringify(NO_WRITE) ")"
28322827
#endif
28332828
, host->hostt->name, host->io_port, host->irq,
28342829
VER_MAJOR, VER_MINOR, VER_PATCH);
@@ -2859,7 +2854,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
28592854
" LINK"
28602855
#endif
28612856
#if (DEBUG & DEBUG_NO_WRITE)
2862-
" NOWRITE ("NO_WRITE_STR")"
2857+
" NOWRITE (" __stringify(NO_WRITE) ")"
28632858
#endif
28642859
"\n\n", VER_MAJOR, VER_MINOR, VER_PATCH);
28652860

0 commit comments

Comments
 (0)