From patchwork Mon Jul 16 12:21:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martijn Coenen X-Patchwork-Id: 10526631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B705A60545 for ; Mon, 16 Jul 2018 12:21:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7CE627DCD for ; Mon, 16 Jul 2018 12:21:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A53227816; Mon, 16 Jul 2018 12:21:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AD4427816 for ; Mon, 16 Jul 2018 12:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730638AbeGPMsz (ORCPT ); Mon, 16 Jul 2018 08:48:55 -0400 Received: from mail-ed1-f45.google.com ([209.85.208.45]:44950 "EHLO mail-ed1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731244AbeGPMsy (ORCPT ); Mon, 16 Jul 2018 08:48:54 -0400 Received: by mail-ed1-f45.google.com with SMTP id d17-v6so17729524eds.11 for ; Mon, 16 Jul 2018 05:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xsnm+DyMmicF0vqrgflj3bi1e1aLXMwQ28DVXdqJt4Y=; b=lnrrUsx5X6dcQ85Usy8IVyNWctv6o4POBLdloywBm8tJIgXdc1NHh/E4HdzQp7QJ4j 1DLgqWcM8/qH/fB8GuStwXyiOi1N6gUM2uO/8SdScBvDlcbaURPAIllyuCIoKKQl9Sch uGTvI+BKUFodR8xWEqy+qfZqJreKwRJZ1+RAbriymWW1jl9VUCyzXYVLONyfYz6LlnPN q3mTxcCWarkdi7RAXkX8n+hjCpqp0ZqdLHmNIb1/I91fndAKZEXKhUZSsJRV9quHAD80 lhrEtQrkfP+EDYEYqGFtBy8uVt7mcSKq23tFicgAiFMp18w4j82+zM46AZ/bluU1nbl8 0rKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xsnm+DyMmicF0vqrgflj3bi1e1aLXMwQ28DVXdqJt4Y=; b=mmkZj+FUbJjBC2QFBCDVh1OvJc9xn+VV6RtjIoLnrqOYspuBBwiWn/g0f1Dx4tdRix 7oH4+IltHLXyITxeWjzYQ8hzZAjsmZ+g5TZLcFIfglFuAL3ML4mpgNzpIlqhUK9tD9j0 X94sHmcC32Fdz2tjTvydqlxTs3dLLR4647CE4iMIG3PCDI3MTa4u8Y7gJnbmzR2kBg2L ZskhsetLB+xfSIDxkcW71z6cjm57PHeKZ2y+kqhSKQVeq7Gv/NppdBptDwlVVf3DzQIn Dn+40bKUwHum+gxRDGskXLLPH4bWOrEyhjF752mqfI6h7p5BIDM09+4ldiipfPyF1ecm 1ZvQ== X-Gm-Message-State: AOUpUlE3UGIN1e+D0C6AAKAXaiQWH4REHlayzITr5wXtdzG/FDGNP9cN VJKo5vp3fEttVxuCGdErbYl6sg== X-Google-Smtp-Source: AAOMgpdtS+Vgvx0IGZJo1ZMsjjwfLJ+MTgvryLYPSHUYBiwXsydESPINkYDf9xMqGtjsQ/Arux3u/Q== X-Received: by 2002:a50:a7a2:: with SMTP id i31-v6mr17712723edc.296.1531743700300; Mon, 16 Jul 2018 05:21:40 -0700 (PDT) Received: from maco.fcp3.net (a83-162-234-235.adsl.xs4all.nl. [83.162.234.235]) by smtp.gmail.com with ESMTPSA id a9-v6sm4635471edi.26.2018.07.16.05.21.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 05:21:39 -0700 (PDT) From: Martijn Coenen To: linux-kernel@vger.kernel.org Cc: Martijn Coenen , Masahiro Yamada , Michal Marek , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Alan Stern , Greg Kroah-Hartman , Oliver Neukum , Arnd Bergmann , Jessica Yu , Stephen Boyd , Philippe Ombredanne , Kate Stewart , Sam Ravnborg , linux-kbuild@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-scsi@vger.kernel.org, linux-arch@vger.kernel.org, maco@google.com, sspatil@google.com, malchev@google.com, joelaf@google.com Subject: [PATCH 6/6] RFC: USB: storage: move symbols into USB_STORAGE namespace. Date: Mon, 16 Jul 2018 14:21:25 +0200 Message-Id: <20180716122125.175792-7-maco@android.com> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog In-Reply-To: <20180716122125.175792-1-maco@android.com> References: <20180716122125.175792-1-maco@android.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Modules using these symbols must now import this namesapce explicitly. Signed-off-by: Martijn Coenen --- drivers/usb/storage/alauda.c | 1 + drivers/usb/storage/cypress_atacb.c | 1 + drivers/usb/storage/datafab.c | 1 + drivers/usb/storage/ene_ub6250.c | 1 + drivers/usb/storage/freecom.c | 1 + drivers/usb/storage/isd200.c | 1 + drivers/usb/storage/jumpshot.c | 1 + drivers/usb/storage/karma.c | 1 + drivers/usb/storage/onetouch.c | 1 + drivers/usb/storage/realtek_cr.c | 1 + drivers/usb/storage/sddr09.c | 1 + drivers/usb/storage/sddr55.c | 1 + drivers/usb/storage/shuttle_usbat.c | 1 + drivers/usb/storage/uas.c | 1 + drivers/usb/storage/usb.c | 20 ++++++++++---------- 15 files changed, 24 insertions(+), 10 deletions(-) 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 @@ MODULE_DESCRIPTION("Driver for Alauda-based card readers"); MODULE_AUTHOR("Daniel Drake "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); /* * 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 @@ MODULE_DESCRIPTION("SAT support for Cypress USB/ATA bridges with ATACB"); MODULE_AUTHOR("Matthieu Castet "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); /* * 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 @@ MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader"); MODULE_AUTHOR("Jimmie Mayfield "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); struct datafab_info { unsigned long sectors; /* total sector count */ diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index 4d261e4de9ad..57e782a62acd 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c @@ -26,6 +26,7 @@ MODULE_DESCRIPTION("Driver for ENE UB6250 reader"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); MODULE_FIRMWARE(SD_INIT1_FIRMWARE); MODULE_FIRMWARE(SD_INIT2_FIRMWARE); 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 @@ MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor"); MODULE_AUTHOR("David Brown "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); #ifdef CONFIG_USB_STORAGE_DEBUG 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 f5e4500d9970..7abb5687b2f6 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c @@ -53,6 +53,7 @@ MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); MODULE_AUTHOR("Björn Stenberg "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); static int isd200_Initialization(struct us_data *us); 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 @@ MODULE_DESCRIPTION("Driver for Lexar \"Jumpshot\" Compact Flash reader"); MODULE_AUTHOR("Jimmie Mayfield "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); /* * The table of devices diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c index edcf2be0e0eb..2b6e74afdcbd 100644 --- a/drivers/usb/storage/karma.c +++ b/drivers/usb/storage/karma.c @@ -23,6 +23,7 @@ MODULE_DESCRIPTION("Driver for Rio Karma"); MODULE_AUTHOR("Bob Copeland , Keith Bennett "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); #define RIO_PREFIX "RIOP\x00" #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 @@ MODULE_DESCRIPTION("Maxtor USB OneTouch hard drive button driver"); MODULE_AUTHOR("Nick Sillik "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); #define ONETOUCH_PKT_LEN 0x02 #define ONETOUCH_BUTTON KEY_PROG1 diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index 31b024441938..96c45fee687a 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c @@ -35,6 +35,7 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader"); MODULE_AUTHOR("wwang "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); static int auto_delink_en = 1; 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 @@ MODULE_DESCRIPTION("Driver for SanDisk SDDR-09 SmartMedia reader"); MODULE_AUTHOR("Andries Brouwer , Robert Baruch "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); static int usb_stor_sddr09_dpcm_init(struct us_data *us); 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 @@ MODULE_DESCRIPTION("Driver for SanDisk SDDR-55 SmartMedia reader"); MODULE_AUTHOR("Simon Munton"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); /* * 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 @@ MODULE_DESCRIPTION("Driver for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable"); MODULE_AUTHOR("Daniel Drake , Robert Baruch "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); /* Supported device types */ #define USBAT_DEV_HP8200 0x01 diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 9e9de5452860..0a9b20478ee9 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -1195,5 +1195,6 @@ static struct usb_driver uas_driver = { module_usb_driver(uas_driver); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(USB_STORAGE); MODULE_AUTHOR( "Hans de Goede , Matthew Wilcox and Sarah Sharp"); diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 9a79cd9762f3..fd5adc4e95d8 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -184,7 +184,7 @@ int usb_stor_suspend(struct usb_interface *iface, pm_message_t message) mutex_unlock(&us->dev_mutex); return 0; } -EXPORT_SYMBOL_GPL(usb_stor_suspend); +EXPORT_SYMBOL_NS_GPL(usb_stor_suspend, USB_STORAGE); int usb_stor_resume(struct usb_interface *iface) { @@ -198,7 +198,7 @@ int usb_stor_resume(struct usb_interface *iface) mutex_unlock(&us->dev_mutex); return 0; } -EXPORT_SYMBOL_GPL(usb_stor_resume); +EXPORT_SYMBOL_NS_GPL(usb_stor_resume, USB_STORAGE); int usb_stor_reset_resume(struct usb_interface *iface) { @@ -213,7 +213,7 @@ int usb_stor_reset_resume(struct usb_interface *iface) */ return 0; } -EXPORT_SYMBOL_GPL(usb_stor_reset_resume); +EXPORT_SYMBOL_NS_GPL(usb_stor_reset_resume, USB_STORAGE); #endif /* CONFIG_PM */ @@ -230,7 +230,7 @@ int usb_stor_pre_reset(struct usb_interface *iface) mutex_lock(&us->dev_mutex); return 0; } -EXPORT_SYMBOL_GPL(usb_stor_pre_reset); +EXPORT_SYMBOL_NS_GPL(usb_stor_pre_reset, USB_STORAGE); int usb_stor_post_reset(struct usb_interface *iface) { @@ -247,7 +247,7 @@ int usb_stor_post_reset(struct usb_interface *iface) mutex_unlock(&us->dev_mutex); return 0; } -EXPORT_SYMBOL_GPL(usb_stor_post_reset); +EXPORT_SYMBOL_NS_GPL(usb_stor_post_reset, USB_STORAGE); /* * fill_inquiry_response takes an unsigned char array (which must @@ -293,7 +293,7 @@ void fill_inquiry_response(struct us_data *us, unsigned char *data, usb_stor_set_xfer_buf(data, data_len, us->srb); } -EXPORT_SYMBOL_GPL(fill_inquiry_response); +EXPORT_SYMBOL_NS_GPL(fill_inquiry_response, USB_STORAGE); static int usb_stor_control_thread(void * __us) { @@ -579,7 +579,7 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags) } *fflags = (*fflags & ~mask) | f; } -EXPORT_SYMBOL_GPL(usb_stor_adjust_quirks); +EXPORT_SYMBOL_NS_GPL(usb_stor_adjust_quirks, USB_STORAGE); /* Get the unusual_devs entries and the string descriptors */ static int get_device_info(struct us_data *us, const struct usb_device_id *id, @@ -990,7 +990,7 @@ int usb_stor_probe1(struct us_data **pus, release_everything(us); return result; } -EXPORT_SYMBOL_GPL(usb_stor_probe1); +EXPORT_SYMBOL_NS_GPL(usb_stor_probe1, USB_STORAGE); /* Second part of general USB mass-storage probing */ int usb_stor_probe2(struct us_data *us) @@ -1074,7 +1074,7 @@ int usb_stor_probe2(struct us_data *us) release_everything(us); return result; } -EXPORT_SYMBOL_GPL(usb_stor_probe2); +EXPORT_SYMBOL_NS_GPL(usb_stor_probe2, USB_STORAGE); /* Handle a USB mass-storage disconnect */ void usb_stor_disconnect(struct usb_interface *intf) @@ -1084,7 +1084,7 @@ void usb_stor_disconnect(struct usb_interface *intf) quiesce_and_remove_host(us); release_everything(us); } -EXPORT_SYMBOL_GPL(usb_stor_disconnect); +EXPORT_SYMBOL_NS_GPL(usb_stor_disconnect, USB_STORAGE); static struct scsi_host_template usb_stor_host_template;