From: Jingoo Han <jg1.han@samsung.com>
To: "'Greg Kroah-Hartman'" <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
"'Jingoo Han'" <jg1.han@samsung.com>,
linux-usb@vger.kernel.org
Subject: [PATCH 31/39] USB: remove DEFINE_PCI_DEVICE_TABLE macro
Date: Tue, 03 Dec 2013 08:27:58 +0900 [thread overview]
Message-ID: <003401ceefb6$22c930e0$685b92a0$%han@samsung.com> (raw)
In-Reply-To: <001501ceefb1$69c96820$3d5c3860$%han@samsung.com>
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/usb/chipidea/ci_hdrc_pci.c | 2 +-
drivers/usb/dwc3/dwc3-pci.c | 2 +-
drivers/usb/gadget/amd5536udc.c | 2 +-
drivers/usb/gadget/pch_udc.c | 2 +-
drivers/usb/host/uhci-pci.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c
index d514332..241ae34 100644
--- a/drivers/usb/chipidea/ci_hdrc_pci.c
+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
@@ -112,7 +112,7 @@ static void ci_hdrc_pci_remove(struct pci_dev *pdev)
*
* Check "pci.h" for details
*/
-static DEFINE_PCI_DEVICE_TABLE(ci_hdrc_pci_id_table) = {
+static const struct pci_device_id ci_hdrc_pci_id_table[] = {
{
PCI_DEVICE(0x153F, 0x1004),
.driver_data = (kernel_ulong_t)&pci_platdata,
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 31443ae..665686e 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -182,7 +182,7 @@ static void dwc3_pci_remove(struct pci_dev *pci)
pci_disable_device(pci);
}
-static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_id_table) = {
+static const struct pci_device_id dwc3_pci_id_table[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS,
PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3),
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 54a1e29..f0ff4a6 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3338,7 +3338,7 @@ static int udc_remote_wakeup(struct udc *dev)
}
/* PCI device parameters */
-static DEFINE_PCI_DEVICE_TABLE(pci_id) = {
+static const struct pci_device_id pci_id[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 32d5e92..78a3d92 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -3210,7 +3210,7 @@ finished:
return retval;
}
-static DEFINE_PCI_DEVICE_TABLE(pch_udc_pcidev_id) = {
+static const struct pci_device_id pch_udc_pcidev_id[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 4cd7988..940304c 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -279,7 +279,7 @@ static const struct hc_driver uhci_driver = {
.hub_control = uhci_hub_control,
};
-static DEFINE_PCI_DEVICE_TABLE(uhci_pci_ids) = { {
+static const struct pci_device_id uhci_pci_ids[] = { {
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
.driver_data = (unsigned long) &uhci_driver,
--
1.7.10.4
next prev parent reply other threads:[~2013-12-02 23:28 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <001501ceefb1$69c96820$3d5c3860$%han@samsung.com>
2013-12-02 22:58 ` [PATCH 01/39] perf/x86/intel: " Jingoo Han
2013-12-02 23:00 ` [PATCH 02/39] bcma: pci: " Jingoo Han
2013-12-02 23:01 ` [PATCH 03/39] block: " Jingoo Han
2013-12-02 23:03 ` [PATCH 04/39] char: amd64-agp: " Jingoo Han
2013-12-02 23:04 ` [PATCH 05/39] cpufreq: nforce2: " Jingoo Han
2013-12-03 5:54 ` Viresh Kumar
2013-12-02 23:05 ` [PATCH 06/39] dma: " Jingoo Han
2013-12-02 23:11 ` Joe Perches
2013-12-03 12:11 ` Shevchenko, Andriy
2013-12-04 0:19 ` Jingoo Han
2013-12-04 12:48 ` Andy Shevchenko
2013-12-02 23:07 ` [PATCH 07/39] edac: " Jingoo Han
2013-12-02 23:20 ` Borislav Petkov
2013-12-02 23:35 ` Jingoo Han
2013-12-06 9:25 ` Borislav Petkov
2013-12-02 23:08 ` [PATCH 08/39] gpio: " Jingoo Han
2013-12-03 12:16 ` Linus Walleij
2013-12-02 23:09 ` [PATCH 09/39] drm: " Jingoo Han
2013-12-02 23:10 ` [PATCH 10/39] hwmon: " Jingoo Han
2013-12-03 0:17 ` Guenter Roeck
2013-12-03 8:02 ` Jean Delvare
2013-12-03 14:32 ` Guenter Roeck
2013-12-03 2:42 ` Guenter Roeck
2013-12-02 23:11 ` [PATCH 11/39] i2c: " Jingoo Han
2013-12-02 23:12 ` [PATCH 12/39] IB: " Jingoo Han
2013-12-02 23:13 ` [PATCH 13/39] ipack: " Jingoo Han
2013-12-02 23:13 ` [PATCH 14/39] leds: leds-ss4200: " Jingoo Han
2013-12-02 23:15 ` [PATCH 15/39] media: pci: " Jingoo Han
2013-12-02 23:15 ` [PATCH 16/39] mfd: " Jingoo Han
2013-12-03 8:11 ` Lee Jones
2013-12-02 23:16 ` [PATCH 17/39] misc: " Jingoo Han
2013-12-02 23:17 ` [PATCH 18/39] mmc: dw_mmc-pci: " Jingoo Han
2013-12-02 23:18 ` [PATCH 19/39] mtd: denali: " Jingoo Han
2013-12-10 7:13 ` Brian Norris
2013-12-02 23:19 ` [PATCH 20/39] net: " Jingoo Han
2013-12-03 2:36 ` Stephen Hemminger
2013-12-03 2:44 ` Jingoo Han
2013-12-02 23:20 ` [PATCH 21/39] NTB: " Jingoo Han
2013-12-02 23:20 ` [PATCH 22/39] pcmcia: " Jingoo Han
2013-12-02 23:21 ` PATCH 23/39] platform: x86: " Jingoo Han
2013-12-02 23:23 ` [PATCH 24/39] ptp: ptp_pch: " Jingoo Han
2013-12-02 23:24 ` [PATCH 25/39] rapidio: tsi721: " Jingoo Han
2013-12-02 23:24 ` [PATCH 26/39] scsi: " Jingoo Han
2013-12-02 23:25 ` [PATCH 27/39] spi: " Jingoo Han
2013-12-03 18:04 ` Mark Brown
2013-12-02 23:26 ` [PATCH 28/39] staging: " Jingoo Han
2013-12-05 9:06 ` ZHAO Gang
2013-12-05 15:43 ` Greg Kroah-Hartman
2013-12-06 0:50 ` ZHAO Gang
2013-12-02 23:26 ` [PATCH 29/39] tty: " Jingoo Han
2013-12-02 23:27 ` [PATCH 30/39] uio: uio_mf624: " Jingoo Han
2013-12-02 23:27 ` Jingoo Han [this message]
2013-12-09 4:03 ` [PATCH 31/39] USB: " Felipe Balbi
2013-12-09 8:33 ` 'Greg Kroah-Hartman'
2013-12-10 2:56 ` Felipe Balbi
2013-12-02 23:28 ` [PATCH 32/39] video: " Jingoo Han
2013-12-02 23:29 ` [PATCH 33/39] virtio: pci: " Jingoo Han
2013-12-02 23:29 ` [PATCH 34/39] vme: " Jingoo Han
2013-12-05 9:14 ` ZHAO Gang
2013-12-05 15:43 ` Greg Kroah-Hartman
2013-12-02 23:30 ` [PATCH 35/39] watchdog: " Jingoo Han
2013-12-03 4:09 ` Guenter Roeck
2013-12-02 23:30 ` [PATCH 36/39] xen: pciback: " Jingoo Han
2013-12-02 23:31 ` [PATCH 37/39] sound: " Jingoo Han
2013-12-02 23:32 ` [PATCH 38/39] PCI: " Jingoo Han
2013-12-02 23:52 ` Joe Perches
2013-12-03 1:15 ` Jingoo Han
2013-12-03 1:27 ` 'Greg Kroah-Hartman'
2013-12-02 23:32 ` [PATCH 39/39] checkpatch: remove check for " Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='003401ceefb6$22c930e0$685b92a0$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®