From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Mon, 28 Feb 2011 19:57:33 +0000 (-0800)
Subject: net: use pci_dev->revision, again
X-Git-Tag: bp-1.0.8.1~18
X-Git-Url: https://bbs.cooldavid.org/git/?p=jme.git;a=commitdiff_plain;h=711edd992467f42538a39f359768e847756d7dc4

net: use pci_dev->revision, again

Several more network drivers that read the device's revision ID
from the PCI configuration register were merged after the commit
44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers
to use pci_device->revision), so it's time to do another pass of
conversion to using the 'revision' field of 'struct pci_dev'...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merged-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---

diff --git a/jme.c b/jme.c
index b883dc2..c146d31 100644
--- a/jme.c
+++ b/jme.c
@@ -3232,7 +3232,11 @@ jme_init_one(struct pci_dev *pdev,
 
 	jme_clear_pm(jme);
 	jme_set_phyfifo_5level(jme);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
 	pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
+#else
+	jme->pcirev = pdev->revision;
+#endif
 	if (!jme->fpgaver)
 		jme_phy_init(jme);
 	jme_phy_off(jme);