[PATCH 5/9] sky2: minor cleanup in power_state and remove dead code

[Stephen Hemminger]

Minor optimization and cleanup.  Local pointer in one place,
and remove now dead inline.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>


--- sky2-1.0.orig/drivers/net/sky2.c
+++ sky2-1.0/drivers/net/sky2.c
@@ -188,6 +188,7 @@ static u16 gm_phy_read(struct sky2_hw *h

static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
{
+       struct pci_dev *pdev = hw->pdev;
u16 power_control;
u32 reg1;
int vaux;
@@ -196,11 +197,11 @@ static int sky2_set_power_state(struct s
pr_debug("sky2_set_power_state %d\n", state);
sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);

-       pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_PMC, &power_control);
+       pci_read_config_word(pdev, hw->pm_cap + PCI_PM_PMC, &power_control);
vaux = (sky2_read8(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
        (power_control & PCI_PM_CAP_PME_D3cold);

-       pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_CTRL, 
&power_control);
+       pci_read_config_word(pdev, hw->pm_cap + PCI_PM_CTRL, &power_control);

power_control |= PCI_PM_CTRL_PME_STATUS;
power_control &= ~(PCI_PM_CTRL_STATE_MASK);
@@ -224,7 +225,7 @@ static int sky2_set_power_state(struct s
                sky2_write8(hw, B2_Y2_CLK_GATE, 0);

        /* Turn off phy power saving */
-               pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+               pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
        reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);

        /* looks like this XL is back asswards .. */
@@ -233,18 +234,18 @@ static int sky2_set_power_state(struct s
                if (hw->ports > 1)
                        reg1 |= PCI_Y2_PHY2_COMA;
        }
-               pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+               pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);
        break;

case PCI_D3hot:
case PCI_D3cold:
        /* Turn on phy power saving */
-               pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+               pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
        if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
        else
                reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
-               pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+               pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);

        if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                sky2_write8(hw, B2_Y2_CLK_GATE, 0);
@@ -266,7 +267,7 @@ static int sky2_set_power_state(struct s
        ret = -1;
}

-       pci_write_config_byte(hw->pdev, hw->pm_cap + PCI_PM_CTRL, 
power_control);
+       pci_write_config_byte(pdev, hw->pm_cap + PCI_PM_CTRL, power_control);
sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
return ret;
}
--- sky2-1.0.orig/drivers/net/sky2.h
+++ sky2-1.0/drivers/net/sky2.h
@@ -1873,14 +1873,6 @@ static inline u8 sky2_read8(const struct
return readb(hw->regs + reg);
}

-/* This should probably go away, bus based tweeks suck */
-static inline int is_pciex(const struct sky2_hw *hw)
-{
-       u32 status;
-       pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status);
-       return (status & PCI_OS_PCI_X) == 0;
-}
-
static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val)
{
writel(val, hw->regs + reg);

--

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html