From d1901be7f5094b4c3f8d048417c494fe30d736d7 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Thu, 17 Mar 2011 16:46:17 -0400
Subject: [PATCH] --- yaml --- r: 243407 b: refs/heads/master c:
 cf5e23e1c27af4291cf90020c295756ba4dcf326 h: refs/heads/master i:   243405:
 522785fb4ba1f2a3450385824100db5d155f51ec   243403:
 cb3757207b3cb869fb7bb0c894135518360b90ec   243399:
 8414b014c2677713421ecf368706dc065049d810   243391:
 f50f473ae6915a4367b33059c463f41cae85ead7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mmc/host/sdhci-pci.c | 6 ++----
 trunk/drivers/mmc/host/via-sdmmc.c | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e4f2cd6db2fa..816328ee5a39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a8fba524c2063cb297bdbacda535448ee365dc4
+refs/heads/master: cf5e23e1c27af4291cf90020c295756ba4dcf326
diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c
index 2f8d46854acd..a136be706347 100644
--- a/trunk/drivers/mmc/host/sdhci-pci.c
+++ b/trunk/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)
diff --git a/trunk/drivers/mmc/host/via-sdmmc.c b/trunk/drivers/mmc/host/via-sdmmc.c
index 8c5b4881ccd6..4dfe2c02ea91 100644
--- a/trunk/drivers/mmc/host/via-sdmmc.c
+++ b/trunk/drivers/mmc/host/via-sdmmc.c
@@ -1087,14 +1087,13 @@ static int __devinit via_sd_probe(struct pci_dev *pcidev,
 	struct mmc_host *mmc;
 	struct via_crdr_mmc_host *sdhost;
 	u32 base, len;
-	u8 rev, gatt;
+	u8  gatt;
 	int ret;
 
-	pci_read_config_byte(pcidev, PCI_CLASS_REVISION, &rev);
 	pr_info(DRV_NAME
 		": VIA SDMMC controller found at %s [%04x:%04x] (rev %x)\n",
 		pci_name(pcidev), (int)pcidev->vendor, (int)pcidev->device,
-		(int)rev);
+		(int)pcidev->revision);
 
 	ret = pci_enable_device(pcidev);
 	if (ret)