Skip to content

Commit

Permalink
net: use pci_dev->revision, again
Browse files Browse the repository at this point in the history 
Several more network drivers that read the device's revision ID
from the PCI configuration register were merged after the commit
44c1013 (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>
  • Loading branch information
Sergei Shtylyov authored and David S. Miller committed Feb 28, 2011
1 parent 63d8ea7 commit ff938e4
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 50 deletions.
2 changes: 1 addition & 1 deletion drivers/net/atl1e/atl1e_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,8 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter)
hw->device_id = pdev->device;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_id = pdev->subsystem_device;
hw->revision_id = pdev->revision;

pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);

phy_status_data = AT_READ_REG(hw, REG_PHY_STATUS);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/atlx/atl2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter)
hw->device_id = pdev->device;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_id = pdev->subsystem_device;
hw->revision_id = pdev->revision;

pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);

adapter->wol = 0;
Expand Down
14 changes: 5 additions & 9 deletions drivers/net/cnic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5158,15 +5158,11 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)

dev_hold(dev);
pci_dev_get(pdev);
if (pdev->device == PCI_DEVICE_ID_NX2_5709 ||
pdev->device == PCI_DEVICE_ID_NX2_5709S) {
u8 rev;

pci_read_config_byte(pdev, PCI_REVISION_ID, &rev);
if (rev < 0x10) {
pci_dev_put(pdev);
goto cnic_err;
}
if ((pdev->device == PCI_DEVICE_ID_NX2_5709 ||
pdev->device == PCI_DEVICE_ID_NX2_5709S) &&
(pdev->revision < 0x10)) {
pci_dev_put(pdev);
goto cnic_err;
}
pci_dev_put(pdev);

Expand Down
6 changes: 2 additions & 4 deletions drivers/net/e1000e/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,11 @@ static void e1000_get_regs(struct net_device *netdev,
struct e1000_hw *hw = &adapter->hw;
u32 *regs_buff = p;
u16 phy_data;
u8 revision_id;

memset(p, 0, E1000_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);
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/igbvf/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/igbvf/netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ipg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2025,7 +2025,6 @@ static void ipg_init_mii(struct net_device *dev)

if (phyaddr != 0x1f) {
u16 mii_phyctrl, mii_1000cr;
u8 revisionid = 0;

mii_1000cr = mdio_read(dev, phyaddr, MII_CTRL1000);
mii_1000cr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF |
Expand All @@ -2035,8 +2034,7 @@ static void ipg_init_mii(struct net_device *dev)
mii_phyctrl = mdio_read(dev, phyaddr, MII_BMCR);

/* Set default phyparam */
pci_read_config_byte(sp->pdev, PCI_REVISION_ID, &revisionid);
ipg_set_phy_default_param(revisionid, dev, phyaddr);
ipg_set_phy_default_param(sp->pdev->revision, dev, phyaddr);

/* Reset PHY */
mii_phyctrl |= BMCR_RESET | BMCR_ANRESTART;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ixgbevf/ixgbevf_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2221,7 +2221,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)

hw->vendor_id = pdev->vendor;
hw->device_id = pdev->device;
pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
hw->revision_id = pdev->revision;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_device_id = pdev->subsystem_device;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/jme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3095,7 +3095,7 @@ jme_init_one(struct pci_dev *pdev,

jme_clear_pm(jme);
jme_set_phyfifo_5level(jme);
pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
jme->pcirev = pdev->revision;
if (!jme->fpgaver)
jme_phy_init(jme);
jme_phy_off(jme);
Expand Down
18 changes: 1 addition & 17 deletions drivers/net/vxge/vxge-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3387,19 +3387,6 @@ static const struct net_device_ops vxge_netdev_ops = {
#endif
};

static int __devinit vxge_device_revision(struct vxgedev *vdev)
{
int ret;
u8 revision;

ret = pci_read_config_byte(vdev->pdev, PCI_REVISION_ID, &revision);
if (ret)
return -EIO;

vdev->titan1 = (revision == VXGE_HW_TITAN1_PCI_REVISION);
return 0;
}

static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
struct vxge_config *config,
int high_dma, int no_of_vpath,
Expand Down Expand Up @@ -3439,10 +3426,7 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
memcpy(&vdev->config, config, sizeof(struct vxge_config));
vdev->rx_csum = 1; /* Enable Rx CSUM by default. */
vdev->rx_hwts = 0;

ret = vxge_device_revision(vdev);
if (ret < 0)
goto _out1;
vdev->titan1 = (vdev->pdev->revision == VXGE_HW_TITAN1_PCI_REVISION);

SET_NETDEV_DEV(ndev, &vdev->pdev->dev);

Expand Down
4 changes: 1 addition & 3 deletions drivers/net/wireless/iwlwifi/iwl-3945.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,13 +898,11 @@ static void iwl3945_nic_config(struct iwl_priv *priv)
{
struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
unsigned long flags;
u8 rev_id = 0;
u8 rev_id = priv->pci_dev->revision;

spin_lock_irqsave(&priv->lock, flags);

/* Determine HW type */
pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id);

IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);

if (rev_id & PCI_CFG_REV_ID_BIT_RTP)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-agn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4056,7 +4056,7 @@ static void iwl_hw_detect(struct iwl_priv *priv)
{
priv->hw_rev = _iwl_read32(priv, CSR_HW_REV);
priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG);
pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id);
priv->rev_id = priv->pci_dev->revision;
IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/net/wireless/rtlwifi/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1477,13 +1477,11 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
struct pci_dev *bridge_pdev = pdev->bus->self;
u16 venderid;
u16 deviceid;
u8 revisionid;
u16 irqline;
u8 tmp;

venderid = pdev->vendor;
deviceid = pdev->device;
pci_read_config_byte(pdev, 0x8, &revisionid);
pci_read_config_word(pdev, 0x3C, &irqline);

if (deviceid == RTL_PCI_8192_DID ||
Expand All @@ -1494,7 +1492,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
deviceid == RTL_PCI_8173_DID ||
deviceid == RTL_PCI_8172_DID ||
deviceid == RTL_PCI_8171_DID) {
switch (revisionid) {
switch (pdev->revision) {
case RTL_PCI_REVISION_ID_8192PCIE:
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
("8192 PCI-E is found - "
Expand Down

0 comments on commit ff938e4

Please sign in to comment.