diff options
author | Matthias Maennich <maennich@google.com> | 2019-09-06 06:32:35 -0400 |
---|---|---|
committer | Jessica Yu <jeyu@kernel.org> | 2019-09-10 04:30:57 -0400 |
commit | 32bca2df7da27be34371a37f9bb5e2b85fdd92bd (patch) | |
tree | e5252e6039c7125df65265dcaed9184acc665dda | |
parent | 8140de1ea3a0002c24eba4b72efbb9403afa6b50 (diff) |
usb-storage: export symbols in USB_STORAGE namespace
Modules using these symbols are required to explicitly import the
namespace. This patch was generated with the following steps and serves
as a reference to use the symbol namespace feature:
1) Define DEFAULT_SYMBOL_NAMESPACE in the corresponding Makefile
2) make (see warnings during modpost about missing imports)
3) make nsdeps
Instead of a DEFAULT_SYMBOL_NAMESPACE definition, the EXPORT_SYMBOL_NS
variants can be used to explicitly specify the namespace. The advantage
of the method used here is that newly added symbols are automatically
exported and existing ones are exported without touching their
respective EXPORT_SYMBOL macro expansion.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
-rw-r--r-- | drivers/usb/storage/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/storage/alauda.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/cypress_atacb.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/datafab.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/ene_ub6250.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/freecom.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/isd200.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/jumpshot.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/karma.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/onetouch.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/realtek_cr.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/sddr09.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/sddr55.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/shuttle_usbat.c | 1 | ||||
-rw-r--r-- | drivers/usb/storage/uas.c | 1 |
15 files changed, 16 insertions, 0 deletions
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index a67ddcbb4e24..46635fa4a340 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile | |||
@@ -8,6 +8,8 @@ | |||
8 | 8 | ||
9 | ccflags-y := -I $(srctree)/drivers/scsi | 9 | ccflags-y := -I $(srctree)/drivers/scsi |
10 | 10 | ||
11 | ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_STORAGE | ||
12 | |||
11 | obj-$(CONFIG_USB_UAS) += uas.o | 13 | obj-$(CONFIG_USB_UAS) += uas.o |
12 | obj-$(CONFIG_USB_STORAGE) += usb-storage.o | 14 | obj-$(CONFIG_USB_STORAGE) += usb-storage.o |
13 | 15 | ||
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 6b8edf6178df..ddab2cd3d2e7 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c | |||
@@ -36,6 +36,7 @@ | |||
36 | MODULE_DESCRIPTION("Driver for Alauda-based card readers"); | 36 | MODULE_DESCRIPTION("Driver for Alauda-based card readers"); |
37 | MODULE_AUTHOR("Daniel Drake <dsd@gentoo.org>"); | 37 | MODULE_AUTHOR("Daniel Drake <dsd@gentoo.org>"); |
38 | MODULE_LICENSE("GPL"); | 38 | MODULE_LICENSE("GPL"); |
39 | MODULE_IMPORT_NS(USB_STORAGE); | ||
39 | 40 | ||
40 | /* | 41 | /* |
41 | * Status bytes | 42 | * Status bytes |
diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c index 4825902377eb..a6f3267bbef6 100644 --- a/drivers/usb/storage/cypress_atacb.c +++ b/drivers/usb/storage/cypress_atacb.c | |||
@@ -22,6 +22,7 @@ | |||
22 | MODULE_DESCRIPTION("SAT support for Cypress USB/ATA bridges with ATACB"); | 22 | MODULE_DESCRIPTION("SAT support for Cypress USB/ATA bridges with ATACB"); |
23 | MODULE_AUTHOR("Matthieu Castet <castet.matthieu@free.fr>"); | 23 | MODULE_AUTHOR("Matthieu Castet <castet.matthieu@free.fr>"); |
24 | MODULE_LICENSE("GPL"); | 24 | MODULE_LICENSE("GPL"); |
25 | MODULE_IMPORT_NS(USB_STORAGE); | ||
25 | 26 | ||
26 | /* | 27 | /* |
27 | * The table of devices | 28 | * The table of devices |
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c index 09353be199be..588818483f4b 100644 --- a/drivers/usb/storage/datafab.c +++ b/drivers/usb/storage/datafab.c | |||
@@ -54,6 +54,7 @@ | |||
54 | MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader"); | 54 | MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader"); |
55 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+datafab@sackheads.org>"); | 55 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+datafab@sackheads.org>"); |
56 | MODULE_LICENSE("GPL"); | 56 | MODULE_LICENSE("GPL"); |
57 | MODULE_IMPORT_NS(USB_STORAGE); | ||
57 | 58 | ||
58 | struct datafab_info { | 59 | struct datafab_info { |
59 | unsigned long sectors; /* total sector count */ | 60 | unsigned long sectors; /* total sector count */ |
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index c26129d5b943..8b1b73065421 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | MODULE_DESCRIPTION("Driver for ENE UB6250 reader"); | 27 | MODULE_DESCRIPTION("Driver for ENE UB6250 reader"); |
28 | MODULE_LICENSE("GPL"); | 28 | MODULE_LICENSE("GPL"); |
29 | MODULE_IMPORT_NS(USB_STORAGE); | ||
29 | MODULE_FIRMWARE(SD_INIT1_FIRMWARE); | 30 | MODULE_FIRMWARE(SD_INIT1_FIRMWARE); |
30 | MODULE_FIRMWARE(SD_INIT2_FIRMWARE); | 31 | MODULE_FIRMWARE(SD_INIT2_FIRMWARE); |
31 | MODULE_FIRMWARE(SD_RW_FIRMWARE); | 32 | MODULE_FIRMWARE(SD_RW_FIRMWARE); |
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c index 4f542df37a44..34e7eaff1174 100644 --- a/drivers/usb/storage/freecom.c +++ b/drivers/usb/storage/freecom.c | |||
@@ -29,6 +29,7 @@ | |||
29 | MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor"); | 29 | MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor"); |
30 | MODULE_AUTHOR("David Brown <usb-storage@davidb.org>"); | 30 | MODULE_AUTHOR("David Brown <usb-storage@davidb.org>"); |
31 | MODULE_LICENSE("GPL"); | 31 | MODULE_LICENSE("GPL"); |
32 | MODULE_IMPORT_NS(USB_STORAGE); | ||
32 | 33 | ||
33 | #ifdef CONFIG_USB_STORAGE_DEBUG | 34 | #ifdef CONFIG_USB_STORAGE_DEBUG |
34 | static void pdump(struct us_data *us, void *ibuffer, int length); | 35 | static void pdump(struct us_data *us, void *ibuffer, int length); |
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 2b474d60b4db..c4da3fd6eff9 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
@@ -53,6 +53,7 @@ | |||
53 | MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); | 53 | MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); |
54 | MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>"); | 54 | MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>"); |
55 | MODULE_LICENSE("GPL"); | 55 | MODULE_LICENSE("GPL"); |
56 | MODULE_IMPORT_NS(USB_STORAGE); | ||
56 | 57 | ||
57 | static int isd200_Initialization(struct us_data *us); | 58 | static int isd200_Initialization(struct us_data *us); |
58 | 59 | ||
diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c index 917f170c4124..229bf0c1afc9 100644 --- a/drivers/usb/storage/jumpshot.c +++ b/drivers/usb/storage/jumpshot.c | |||
@@ -51,6 +51,7 @@ | |||
51 | MODULE_DESCRIPTION("Driver for Lexar \"Jumpshot\" Compact Flash reader"); | 51 | MODULE_DESCRIPTION("Driver for Lexar \"Jumpshot\" Compact Flash reader"); |
52 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+usb@sackheads.org>"); | 52 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+usb@sackheads.org>"); |
53 | MODULE_LICENSE("GPL"); | 53 | MODULE_LICENSE("GPL"); |
54 | MODULE_IMPORT_NS(USB_STORAGE); | ||
54 | 55 | ||
55 | /* | 56 | /* |
56 | * The table of devices | 57 | * The table of devices |
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c index 395cf8fb5870..05cec81dcd3f 100644 --- a/drivers/usb/storage/karma.c +++ b/drivers/usb/storage/karma.c | |||
@@ -23,6 +23,7 @@ | |||
23 | MODULE_DESCRIPTION("Driver for Rio Karma"); | 23 | MODULE_DESCRIPTION("Driver for Rio Karma"); |
24 | MODULE_AUTHOR("Bob Copeland <me@bobcopeland.com>, Keith Bennett <keith@mcs.st-and.ac.uk>"); | 24 | MODULE_AUTHOR("Bob Copeland <me@bobcopeland.com>, Keith Bennett <keith@mcs.st-and.ac.uk>"); |
25 | MODULE_LICENSE("GPL"); | 25 | MODULE_LICENSE("GPL"); |
26 | MODULE_IMPORT_NS(USB_STORAGE); | ||
26 | 27 | ||
27 | #define RIO_PREFIX "RIOP\x00" | 28 | #define RIO_PREFIX "RIOP\x00" |
28 | #define RIO_PREFIX_LEN 5 | 29 | #define RIO_PREFIX_LEN 5 |
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 39a5009a41a6..a989fe930e21 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c | |||
@@ -25,6 +25,7 @@ | |||
25 | MODULE_DESCRIPTION("Maxtor USB OneTouch hard drive button driver"); | 25 | MODULE_DESCRIPTION("Maxtor USB OneTouch hard drive button driver"); |
26 | MODULE_AUTHOR("Nick Sillik <n.sillik@temple.edu>"); | 26 | MODULE_AUTHOR("Nick Sillik <n.sillik@temple.edu>"); |
27 | MODULE_LICENSE("GPL"); | 27 | MODULE_LICENSE("GPL"); |
28 | MODULE_IMPORT_NS(USB_STORAGE); | ||
28 | 29 | ||
29 | #define ONETOUCH_PKT_LEN 0x02 | 30 | #define ONETOUCH_PKT_LEN 0x02 |
30 | #define ONETOUCH_BUTTON KEY_PROG1 | 31 | #define ONETOUCH_BUTTON KEY_PROG1 |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index 1d9ce9cbc831..3789698d9d3c 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -35,6 +35,7 @@ | |||
35 | MODULE_DESCRIPTION("Driver for Realtek USB Card Reader"); | 35 | MODULE_DESCRIPTION("Driver for Realtek USB Card Reader"); |
36 | MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>"); | 36 | MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>"); |
37 | MODULE_LICENSE("GPL"); | 37 | MODULE_LICENSE("GPL"); |
38 | MODULE_IMPORT_NS(USB_STORAGE); | ||
38 | 39 | ||
39 | static int auto_delink_en = 1; | 40 | static int auto_delink_en = 1; |
40 | module_param(auto_delink_en, int, S_IRUGO | S_IWUSR); | 41 | module_param(auto_delink_en, int, S_IRUGO | S_IWUSR); |
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c index bc9da736bdfc..51bcd4a43690 100644 --- a/drivers/usb/storage/sddr09.c +++ b/drivers/usb/storage/sddr09.c | |||
@@ -47,6 +47,7 @@ | |||
47 | MODULE_DESCRIPTION("Driver for SanDisk SDDR-09 SmartMedia reader"); | 47 | MODULE_DESCRIPTION("Driver for SanDisk SDDR-09 SmartMedia reader"); |
48 | MODULE_AUTHOR("Andries Brouwer <aeb@cwi.nl>, Robert Baruch <autophile@starband.net>"); | 48 | MODULE_AUTHOR("Andries Brouwer <aeb@cwi.nl>, Robert Baruch <autophile@starband.net>"); |
49 | MODULE_LICENSE("GPL"); | 49 | MODULE_LICENSE("GPL"); |
50 | MODULE_IMPORT_NS(USB_STORAGE); | ||
50 | 51 | ||
51 | static int usb_stor_sddr09_dpcm_init(struct us_data *us); | 52 | static int usb_stor_sddr09_dpcm_init(struct us_data *us); |
52 | static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us); | 53 | static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us); |
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c index b8527c55335b..ba955d65eb0e 100644 --- a/drivers/usb/storage/sddr55.c +++ b/drivers/usb/storage/sddr55.c | |||
@@ -29,6 +29,7 @@ | |||
29 | MODULE_DESCRIPTION("Driver for SanDisk SDDR-55 SmartMedia reader"); | 29 | MODULE_DESCRIPTION("Driver for SanDisk SDDR-55 SmartMedia reader"); |
30 | MODULE_AUTHOR("Simon Munton"); | 30 | MODULE_AUTHOR("Simon Munton"); |
31 | MODULE_LICENSE("GPL"); | 31 | MODULE_LICENSE("GPL"); |
32 | MODULE_IMPORT_NS(USB_STORAGE); | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * The table of devices | 35 | * The table of devices |
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c index 854498e1012c..54aa1392c9ca 100644 --- a/drivers/usb/storage/shuttle_usbat.c +++ b/drivers/usb/storage/shuttle_usbat.c | |||
@@ -48,6 +48,7 @@ | |||
48 | MODULE_DESCRIPTION("Driver for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable"); | 48 | MODULE_DESCRIPTION("Driver for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable"); |
49 | MODULE_AUTHOR("Daniel Drake <dsd@gentoo.org>, Robert Baruch <autophile@starband.net>"); | 49 | MODULE_AUTHOR("Daniel Drake <dsd@gentoo.org>, Robert Baruch <autophile@starband.net>"); |
50 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
51 | MODULE_IMPORT_NS(USB_STORAGE); | ||
51 | 52 | ||
52 | /* Supported device types */ | 53 | /* Supported device types */ |
53 | #define USBAT_DEV_HP8200 0x01 | 54 | #define USBAT_DEV_HP8200 0x01 |
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 047c5922618f..bf80d6f81f58 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c | |||
@@ -1219,5 +1219,6 @@ static struct usb_driver uas_driver = { | |||
1219 | module_usb_driver(uas_driver); | 1219 | module_usb_driver(uas_driver); |
1220 | 1220 | ||
1221 | MODULE_LICENSE("GPL"); | 1221 | MODULE_LICENSE("GPL"); |
1222 | MODULE_IMPORT_NS(USB_STORAGE); | ||
1222 | MODULE_AUTHOR( | 1223 | MODULE_AUTHOR( |
1223 | "Hans de Goede <hdegoede@redhat.com>, Matthew Wilcox and Sarah Sharp"); | 1224 | "Hans de Goede <hdegoede@redhat.com>, Matthew Wilcox and Sarah Sharp"); |