Skip to content

Commit ceb8bf2

Browse files
masahir0ytorvalds
authored andcommitted
module: Convert default symbol namespace to string literal
Commit cdd30eb ("module: Convert symbol namespace to string literal") only converted MODULE_IMPORT_NS() and EXPORT_SYMBOL_NS(), leaving DEFAULT_SYMBOL_NAMESPACE as a macro expansion. This commit converts DEFAULT_SYMBOL_NAMESPACE in the same way to avoid annoyance for the default namespace as well. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 3727b1a commit ceb8bf2

File tree

18 files changed

+21
-21
lines changed

18 files changed

+21
-21
lines changed

Documentation/core-api/symbol-namespaces.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
6868
export all symbols defined in usb-common into the namespace USB_COMMON, add a
6969
line like this to drivers/usb/common/Makefile::
7070

71-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
71+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7272

7373
That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
7474
symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
7979
unit as preprocessor statement. The above example would then read::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
8585
used.

Documentation/translations/it_IT/core-api/symbol-namespaces.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Per esempio per esportare tutti i simboli definiti in usb-common nello spazio
6969
dei nomi USB_COMMON, si può aggiungere la seguente linea in
7070
drivers/usb/common/Makefile::
7171

72-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
72+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7373

7474
Questo cambierà tutte le macro EXPORT_SYMBOL() ed EXPORT_SYMBOL_GPL(). Invece,
7575
un simbolo esportato con EXPORT_SYMBOL_NS() non verrà cambiato e il simbolo
@@ -79,7 +79,7 @@ Una seconda possibilità è quella di definire il simbolo di preprocessore
7979
direttamente nei file da compilare. L'esempio precedente diventerebbe::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
Questo va messo prima di un qualsiasi uso di EXPORT_SYMBOL.
8585

Documentation/translations/zh_CN/core-api/symbol-namespaces.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
子系统的 ``Makefile`` 中定义默认命名空间。例如,如果要将usb-common中定义的所有符号导
6767
出到USB_COMMON命名空间,可以在drivers/usb/common/Makefile中添加这样一行::
6868

69-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
69+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7070

7171
这将影响所有 EXPORT_SYMBOL() 和 EXPORT_SYMBOL_GPL() 语句。当这个定义存在时,
7272
用EXPORT_SYMBOL_NS()导出的符号仍然会被导出到作为命名空间参数传递的命名空间中,
@@ -76,7 +76,7 @@
7676
成::
7777

7878
#undef DEFAULT_SYMBOL_NAMESPACE
79-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
79+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8080

8181
应置于相关编译单元中任何 EXPORT_SYMBOL 宏之前
8282

drivers/cdx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
66
#
77

8-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CDX_BUS
8+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CDX_BUS"'
99

1010
obj-$(CONFIG_CDX_BUS) += cdx.o controller/
1111

drivers/crypto/intel/iaa/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for IAA crypto device drivers
44
#
55

6-
ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE=IDXD
6+
ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
77

88
obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) := iaa_crypto.o
99

drivers/crypto/intel/qat/qat_common/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o
3-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CRYPTO_QAT
3+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CRYPTO_QAT"'
44
intel_qat-objs := adf_cfg.o \
55
adf_isr.o \
66
adf_ctl_drv.o \

drivers/dma/idxd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=IDXD
1+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
22

33
obj-$(CONFIG_INTEL_IDXD_BUS) += idxd_bus.o
44
idxd_bus-y := bus.o

drivers/gpio/gpio-idio-16.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "gpio-idio-16.h"
1616

17-
#define DEFAULT_SYMBOL_NAMESPACE GPIO_IDIO_16
17+
#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
1818

1919
#define IDIO_16_DAT_BASE 0x0
2020
#define IDIO_16_OUT_BASE IDIO_16_DAT_BASE

drivers/hwmon/nct6775-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#include "nct6775.h"
5858

5959
#undef DEFAULT_SYMBOL_NAMESPACE
60-
#define DEFAULT_SYMBOL_NAMESPACE HWMON_NCT6775
60+
#define DEFAULT_SYMBOL_NAMESPACE "HWMON_NCT6775"
6161

6262
#define USE_ALTERNATE
6363

drivers/i2c/busses/i2c-designware-common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/types.h>
3030
#include <linux/units.h>
3131

32-
#define DEFAULT_SYMBOL_NAMESPACE I2C_DW_COMMON
32+
#define DEFAULT_SYMBOL_NAMESPACE "I2C_DW_COMMON"
3333

3434
#include "i2c-designware-core.h"
3535

0 commit comments

Comments
 (0)