diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-02-28 11:57:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-28 11:57:33 -0800 |
| commit | ff938e43d39e926de74b32a3656c190f979ab642 (patch) | |
| tree | b914a3f7cc9923013133462a55f5dbe9e7a7799c /drivers/net/igbvf | |
| parent | 63d8ea7f93e1fb9d1aa9509ab3e1a71199245c80 (diff) | |
| download | kernel_samsung_smdk4412-ff938e43d39e926de74b32a3656c190f979ab642.zip kernel_samsung_smdk4412-ff938e43d39e926de74b32a3656c190f979ab642.tar.gz kernel_samsung_smdk4412-ff938e43d39e926de74b32a3656c190f979ab642.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/igbvf')
| -rw-r--r-- | drivers/net/igbvf/ethtool.c | 6 | ||||
| -rw-r--r-- | drivers/net/igbvf/netdev.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c index ed6e3d9..1d943aa 100644 --- a/drivers/net/igbvf/ethtool.c +++ b/drivers/net/igbvf/ethtool.c @@ -201,13 +201,11 @@ static void igbvf_get_regs(struct net_device *netdev, struct igbvf_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; u32 *regs_buff = p; - u8 revision_id; memset(p, 0, IGBVF_REGS_LEN * sizeof(u32)); - pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id); - - regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device; + regs->version = (1 << 24) | (adapter->pdev->revision << 16) | + adapter->pdev->device; regs_buff[0] = er32(CTRL); regs_buff[1] = er32(STATUS); diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 42fdf59..6ccc32f 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c @@ -2639,8 +2639,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, hw->device_id = pdev->device; hw->subsystem_vendor_id = pdev->subsystem_vendor; hw->subsystem_device_id = pdev->subsystem_device; - - pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id); + hw->revision_id = pdev->revision; err = -EIO; adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, 0), |