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>,
"'Bjorn Helgaas'" <bhelgaas@google.com>,
linux-pci@vger.kernel.org
Subject: [PATCH 38/39] PCI: remove DEFINE_PCI_DEVICE_TABLE macro
Date: Tue, 03 Dec 2013 08:32:16 +0900 [thread overview]
Message-ID: <003b01ceefb6$bca43ed0$35ecbc70$%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. Also, the definition of DEFINE_PCI_DEVICE_TABLE
macro is removed.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
Documentation/PCI/pci.txt | 3 +--
drivers/pci/ioapic.c | 2 +-
include/linux/pci.h | 10 ----------
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt
index 6f45856..2f14be7 100644
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -123,8 +123,7 @@ initialization with a pointer to a structure describing the driver
The ID table is an array of struct pci_device_id entries ending with an
-all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred
-method of declaring the table. Each entry consists of:
+all-zero entry; Each entry consists of:
vendor,device Vendor and device ID to match (or PCI_ANY_ID)
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 50ce680..d9d249a2 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -99,7 +99,7 @@ static void ioapic_remove(struct pci_dev *dev)
}
-static DEFINE_PCI_DEVICE_TABLE(ioapic_devices) = {
+static const struct pci_device_id ioapic_devices[] = {
{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) },
{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) },
{ }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1084a15..6c1f6af 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -631,16 +631,6 @@ struct pci_driver {
#define to_pci_driver(drv) container_of(drv, struct pci_driver, driver)
/**
- * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table
- * @_table: device table name
- *
- * This macro is used to create a struct pci_device_id array (a device table)
- * in a generic manner.
- */
-#define DEFINE_PCI_DEVICE_TABLE(_table) \
- const struct pci_device_id _table[]
-
-/**
* PCI_DEVICE - macro used to describe a specific pci device
* @vend: the 16 bit PCI Vendor ID
* @dev: the 16 bit PCI Device ID
--
1.7.10.4
next prev parent reply other threads:[~2013-12-02 23:32 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: remove DEFINE_PCI_DEVICE_TABLE macro 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 ` [PATCH 31/39] USB: " Jingoo Han
2013-12-09 4:03 ` 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 ` Jingoo Han [this message]
2013-12-02 23:52 ` [PATCH 38/39] PCI: " 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='003b01ceefb6$bca43ed0$35ecbc70$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@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