2010-07-15 18:39:47

by Peter Huewe

Subject: [PATCH 04/25] ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)

From: Peter Huewe <[email protected]>

This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
.subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
PCI_VDEVICE macro, and thus improves readability.

Signed-off-by: Peter Huewe <[email protected]>
---
drivers/ata/pata_scc.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index d9db3f8..fe36966 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.7.1

2010-08-01 23:48:30

by Jeff Garzik

Subject: Re: [PATCH 04/25] ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)

On 07/15/2010 02:39 PM, Peter Huewe wrote:
> From: Peter Huewe<[email protected]>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe<[email protected]>
> ---
> drivers/ata/pata_scc.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
> index d9db3f8..fe36966 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 */

applied

I would prefer to leave ata_piix as it is, though. It's nice and
manageable :)