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>,
"'James E.J. Bottomley'" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org
Subject: [PATCH 26/39] scsi: remove DEFINE_PCI_DEVICE_TABLE macro
Date: Tue, 03 Dec 2013 08:24:47 +0900 [thread overview]
Message-ID: <002f01ceefb5$b09bc280$11d34780$%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/scsi/BusLogic.c | 2 +-
drivers/scsi/be2iscsi/be_main.c | 2 +-
drivers/scsi/csiostor/csio_init.c | 2 +-
drivers/scsi/isci/init.c | 2 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
drivers/scsi/mvumi.c | 2 +-
drivers/scsi/ufs/ufshcd-pci.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 972f817..64c7514 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3893,7 +3893,7 @@ __setup("BusLogic=", blogic_setup);
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ }
};*/
-static DEFINE_PCI_DEVICE_TABLE(blogic_pci_tbl) = {
+static const struct pci_device_id blogic_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER)},
{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC)},
{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT)},
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 1f37505..1f1f39d 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -534,7 +534,7 @@ static umode_t beiscsi_eth_get_attr_visibility(void *data, int type)
}
/*------------------- PCI Driver operations and data ----------------- */
-static DEFINE_PCI_DEVICE_TABLE(beiscsi_pci_id_table) = {
+static const struct pci_device_id beiscsi_pci_id_table[] = {
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 1aafc33..17794ad 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -1167,7 +1167,7 @@ static struct pci_error_handlers csio_err_handler = {
.resume = csio_pci_resume,
};
-static DEFINE_PCI_DEVICE_TABLE(csio_pci_tbl) = {
+static const struct pci_device_id csio_pci_tbl[] = {
CSIO_DEVICE(CSIO_DEVID_T440DBG_FCOE, 0), /* T4 DEBUG FCOE */
CSIO_DEVICE(CSIO_DEVID_T420CR_FCOE, 0), /* T420CR FCOE */
CSIO_DEVICE(CSIO_DEVID_T422CR_FCOE, 0), /* T422CR FCOE */
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index d25d0d8..c457138 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -75,7 +75,7 @@ MODULE_VERSION(DRV_VERSION);
static struct scsi_transport_template *isci_transport_template;
-static DEFINE_PCI_DEVICE_TABLE(isci_id_table) = {
+static const struct pci_device_id isci_id_table[] = {
{ PCI_VDEVICE(INTEL, 0x1D61),},
{ PCI_VDEVICE(INTEL, 0x1D63),},
{ PCI_VDEVICE(INTEL, 0x1D65),},
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index a961fe1..2834108 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -247,7 +247,7 @@ struct _scsi_io_transfer {
/*
* The pci device ids are defined in mpi/mpi2_cnfg.h.
*/
-static DEFINE_PCI_DEVICE_TABLE(scsih_pci_table) = {
+static const struct pci_device_id scsih_pci_table[] = {
/* Fury ~ 3004 and 3008 */
{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
PCI_ANY_ID, PCI_ANY_ID },
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index edbee8d..27e5986 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("jyli@marvell.com");
MODULE_DESCRIPTION("Marvell UMI Driver");
-static DEFINE_PCI_DEVICE_TABLE(mvumi_pci_table) = {
+static const struct pci_device_id mvumi_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9143) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9580) },
{ 0 }
diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c
index 8b95312..ff1f0c3 100644
--- a/drivers/scsi/ufs/ufshcd-pci.c
+++ b/drivers/scsi/ufs/ufshcd-pci.c
@@ -211,7 +211,7 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = {
.runtime_idle = ufshcd_pci_runtime_idle,
};
-static DEFINE_PCI_DEVICE_TABLE(ufshcd_pci_tbl) = {
+static const struct pci_device_id ufshcd_pci_tbl[] = {
{ PCI_VENDOR_ID_SAMSUNG, 0xC00C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ } /* terminate list */
};
--
1.7.10.4
next prev parent reply other threads:[~2013-12-02 23:24 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 ` Jingoo Han [this message]
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 ` [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='002f01ceefb5$b09bc280$11d34780$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=JBottomley@parallels.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@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