diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-03-17 16:46:17 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-03-25 10:30:49 -0400 |
| commit | cf5e23e1c27af4291cf90020c295756ba4dcf326 (patch) | |
| tree | 9a3cf3bac5943b0b73205ddda5d126ec067e4c70 /drivers/mmc/host/sdhci-pci.c | |
| parent | 5a8fba524c2063cb297bdbacda535448ee365dc4 (diff) | |
| download | op-kernel-dev-cf5e23e1c27af4291cf90020c295756ba4dcf326.zip op-kernel-dev-cf5e23e1c27af4291cf90020c295756ba4dcf326.tar.gz | |
mmc: use pci_dev->revision
The SDHCI driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so
it was not converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65
(PCI: Change all drivers to use pci_device->revision). The newer VIA
driver has similar code too. This patch converts both drivers to use
the 'revision' field of 'struct pci_dev'.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-pci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 2f8d468..a136be7 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -1016,16 +1016,14 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, struct sdhci_pci_chip *chip; struct sdhci_pci_slot *slot; - u8 slots, rev, first_bar; + u8 slots, first_bar; int ret, i; BUG_ON(pdev == NULL); BUG_ON(ent == NULL); - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev); - dev_info(&pdev->dev, "SDHCI controller found [%04x:%04x] (rev %x)\n", - (int)pdev->vendor, (int)pdev->device, (int)rev); + (int)pdev->vendor, (int)pdev->device, (int)pdev->revision); ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &slots); if (ret) |
