From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Jeff Garzik <jgarzik@pobox.com>, linux-ide@vger.kernel.org
Subject: [PATCH 01/19] drivers/ata: Use PCI_VDEVICE
Date: Wed, 24 Jun 2009 22:13:17 -0700 [thread overview]
Message-ID: <53a7eeb02402fb043bd1bc4416cc136eb788e345.1245906152.git.joe@perches.com> (raw)
In-Reply-To: <cover.1245906151.git.joe@perches.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/ata/ata_piix.c | 98 ++++++++++++++++++++++++------------------------
drivers/ata/pata_scc.c | 3 +-
2 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index d0a14cf..d161b06 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -182,115 +182,115 @@ static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
/* Intel PIIX3 for the 430HX etc */
- { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
+ { PCI_VDEVICE(INTEL, 0x7010), piix_pata_mwdma },
/* VMware ICH4 */
{ 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw },
/* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
- { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7111), piix_pata_33 },
/* Intel PIIX4 */
- { 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7199), piix_pata_33 },
/* Intel PIIX4 */
- { 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7601), piix_pata_33 },
/* Intel PIIX */
- { 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x84CA), piix_pata_33 },
/* Intel ICH (i810, i815, i840) UDMA 66*/
- { 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
+ { PCI_VDEVICE(INTEL, 0x2411), ich_pata_66 },
/* Intel ICH0 : UDMA 33*/
- { 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x2421), ich_pata_33 },
/* Intel ICH2M */
- { 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x244A), ich_pata_100 },
/* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
- { 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x244B), ich_pata_100 },
/* Intel ICH3M */
- { 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x248A), ich_pata_100 },
/* Intel ICH3 (E7500/1) UDMA 100 */
- { 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x248B), ich_pata_100 },
/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
- { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24CA), ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24CB), ich_pata_100 },
/* Intel ICH5 */
- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24DB), ich_pata_100 },
/* C-ICH (i810E2) */
- { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x245B), ich_pata_100 },
/* ESB (855GME/875P + 6300ESB) UDMA 100 */
- { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x25A2), ich_pata_100 },
/* ICH6 (and 6) (i915) UDMA 100 */
- { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x266F), ich_pata_100 },
/* ICH7/7-R (i945, i975) UDMA 100*/
- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
- { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
+ { PCI_VDEVICE(INTEL, 0x27DF), ich_pata_100_nomwdma1 },
+ { PCI_VDEVICE(INTEL, 0x269E), ich_pata_100_nomwdma1 },
/* ICH8 Mobile PATA Controller */
- { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x2850), ich_pata_100 },
/* SATA ports */
/* 82801EB (ICH5) */
- { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x24d1), ich5_sata },
/* 82801EB (ICH5) */
- { 0x8086, 0x24df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x24df), ich5_sata },
/* 6300ESB (ICH5 variant with broken PCS present bits) */
- { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x25a3), ich5_sata },
/* 6300ESB pretending RAID */
- { 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x25b0), ich5_sata },
/* 82801FB/FW (ICH6/ICH6W) */
- { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2651), ich6_sata },
/* 82801FR/FRW (ICH6R/ICH6RW) */
- { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2652), ich6_sata },
/* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented).
* Attach iff the controller is in IDE mode. */
{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata },
/* 82801GB/GR/GH (ICH7, identical to ICH6) */
- { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x27c0), ich6_sata },
/* 2801GBM/GHM (ICH7M, identical to ICH6M) */
- { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata },
+ { PCI_VDEVICE(INTEL, 0x27c4), ich6m_sata },
/* Enterprise Southbridge 2 (631xESB/632xESB) */
- { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2680), ich6_sata },
/* SATA Controller 1 IDE (ICH8) */
- { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2820), ich8_sata },
/* SATA Controller 2 IDE (ICH8) */
- { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2825), ich8_2port_sata },
/* Mobile SATA Controller IDE (ICH8M), Apple */
{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a3, 0, 0, ich8m_apple_sata },
/* Mobile SATA Controller IDE (ICH8M) */
- { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2828), ich8_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2920), ich8_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2921), ich8_2port_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2926), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2928), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x292d), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x292e), ich8_sata },
/* SATA Controller IDE (Tolapai) */
- { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata },
+ { PCI_VDEVICE(INTEL, 0x5028), tolapai_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3a00), ich8_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3a06), ich8_2port_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3a20), ich8_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3a26), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b20), ich8_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b21), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b26), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b28), ich8_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b2d), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b2e), ich8_sata },
{ } /* terminate list */
};
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 4257d6b..13fb022 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = {
};
static const struct pci_device_id scc_pci_tbl[] = {
- {PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
{ } /* terminate list */
};
--
1.6.3.1.10.g659a0.dirty
next prev parent reply other threads:[~2009-06-25 5:41 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-25 5:13 [PATCH 00/19] " Joe Perches
2009-06-25 5:13 ` Joe Perches [this message]
2009-06-25 5:13 ` [PATCH 02/19] drivers/atm: " Joe Perches
2009-06-25 5:13 ` [PATCH 03/19] drivers/block: " Joe Perches
2009-06-25 5:13 ` [PATCH 04/19] drivers/char/hw_random: " Joe Perches
2009-06-25 5:36 ` Matt Mackall
2009-06-25 5:51 ` Herbert Xu
2009-06-25 5:13 ` [PATCH 05/19] drivers/isdn: " Joe Perches
2009-06-25 5:13 ` [PATCH 06/19] drivers/media: " Joe Perches
2009-06-25 5:13 ` [PATCH 07/19] drivers/memstick: " Joe Perches
2009-06-25 5:13 ` [PATCH 08/19] drivers/misc: " Joe Perches
2009-06-25 5:13 ` [PATCH 09/19] drivers/mmc: " Joe Perches
2009-06-25 5:13 ` [PATCH 10/19] drivers/net/wan: " Joe Perches
2009-06-28 11:43 ` Krzysztof Halasa
2009-06-25 5:13 ` [PATCH 11/19] drivers/net/wireless: " Joe Perches
2009-06-25 20:30 ` reinette chatre
2009-06-25 5:13 ` [PATCH 12/19] drivers/net: " Joe Perches
2009-06-25 5:50 ` David Dillow
2009-06-25 6:19 ` Grant Grundler
2009-06-25 12:24 ` Daniele Venzano
2009-06-25 13:52 ` Jens Osterkamp
2009-06-25 5:13 ` [PATCH 13/19] drivers/parport: " Joe Perches
2009-06-25 5:13 ` [PATCH 14/19] drivers/scsi: " Joe Perches
2009-06-27 17:20 ` James Bottomley
2009-06-27 19:53 ` Joe Perches
2009-06-27 20:56 ` James Bottomley
2009-06-28 1:25 ` Joe Perches
2009-06-25 5:13 ` [PATCH 15/19] drivers/serial: " Joe Perches
2009-06-25 5:13 ` [PATCH 16/19] drivers/staging: " Joe Perches
2009-06-25 14:24 ` Jiri Slaby
2009-06-25 14:53 ` Joe Perches
2009-07-02 20:06 ` Greg KH
2009-06-25 5:13 ` [PATCH 17/19] drivers/telephony: " Joe Perches
2009-06-25 5:13 ` [PATCH 18/19] drivers/video: " Joe Perches
2009-06-26 9:54 ` Ville Syrjälä
2009-06-26 16:35 ` Joe Perches
2009-06-26 17:31 ` Ville Syrjälä
2009-06-25 5:13 ` [PATCH 19/19] sound: " Joe Perches
2009-06-25 5:43 ` Takashi Iwai
2009-06-25 5:47 ` Joe Perches
2009-06-25 5:55 ` Takashi Iwai
2009-06-25 6:18 ` [PATCH 20/19] sound: Use PCI_VDEVICE for CREATIVE and ECTIVA Joe Perches
2009-06-25 6:59 ` Takashi Iwai
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=53a7eeb02402fb043bd1bc4416cc136eb788e345.1245906152.git.joe@perches.com \
--to=joe@perches.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@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®