| Message ID | 1529768142-9989-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
| Series | mtd: replace VMLINUX_SYMBOL_STR() with string literal | expand |
On Sun, 24 Jun 2018 00:35:42 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > With the special case handling for Blackfin and Metag was removed by > commit 94e58e0ac312 ("export.h: remove code for prefixing symbols with > underscore"), VMLINUX_SYMBOL_STR() can be replaced with string literal. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied. Thanks, Boris > --- > > drivers/mtd/chips/gen_probe.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c > index b57ceea..879bebf 100644 > --- a/drivers/mtd/chips/gen_probe.c > +++ b/drivers/mtd/chips/gen_probe.c > @@ -202,10 +202,10 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map, > struct cfi_private *cfi = map->fldrv_priv; > __u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID; > #ifdef CONFIG_MODULES > - char probename[sizeof(VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X))]; > + char probename[sizeof("cfi_cmdset_%4.4X")]; > cfi_cmdset_fn_t *probe_function; > > - sprintf(probename, VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X), type); > + sprintf(probename, "cfi_cmdset_%4.4X", type); > > probe_function = __symbol_get(probename); > if (!probe_function) {
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c index b57ceea..879bebf 100644 --- a/drivers/mtd/chips/gen_probe.c +++ b/drivers/mtd/chips/gen_probe.c @@ -202,10 +202,10 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map, struct cfi_private *cfi = map->fldrv_priv; __u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID; #ifdef CONFIG_MODULES - char probename[sizeof(VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X))]; + char probename[sizeof("cfi_cmdset_%4.4X")]; cfi_cmdset_fn_t *probe_function; - sprintf(probename, VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X), type); + sprintf(probename, "cfi_cmdset_%4.4X", type); probe_function = __symbol_get(probename); if (!probe_function) {
With the special case handling for Blackfin and Metag was removed by commit 94e58e0ac312 ("export.h: remove code for prefixing symbols with underscore"), VMLINUX_SYMBOL_STR() can be replaced with string literal. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/mtd/chips/gen_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)