Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf5e23e1 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Chris Ball
Browse files

mmc: use pci_dev->revision 



The SDHCI driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so
it was not converted by commit 44c10138
(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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: default avatarHarald Welte <HaraldWelte@viatech.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5a8fba52

drivers/mmc/host/sdhci-pci.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

drivers/mmc/host/via-sdmmc.c

+2 −3
Original line number Diff line number Diff line
@@ -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)