diff options
Diffstat (limited to 'drivers/net/stmmac/dwmac100_core.c')
-rw-r--r-- | drivers/net/stmmac/dwmac100_core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/stmmac/dwmac100_core.c index fab14a4cb14c..6f270a0e151a 100644 --- a/drivers/net/stmmac/dwmac100_core.c +++ b/drivers/net/stmmac/dwmac100_core.c | |||
@@ -40,7 +40,6 @@ static void dwmac100_core_init(unsigned long ioaddr) | |||
40 | #ifdef STMMAC_VLAN_TAG_USED | 40 | #ifdef STMMAC_VLAN_TAG_USED |
41 | writel(ETH_P_8021Q, ioaddr + MAC_VLAN1); | 41 | writel(ETH_P_8021Q, ioaddr + MAC_VLAN1); |
42 | #endif | 42 | #endif |
43 | return; | ||
44 | } | 43 | } |
45 | 44 | ||
46 | static void dwmac100_dump_mac_regs(unsigned long ioaddr) | 45 | static void dwmac100_dump_mac_regs(unsigned long ioaddr) |
@@ -76,7 +75,6 @@ static void dwmac100_dump_mac_regs(unsigned long ioaddr) | |||
76 | MMC_HIGH_INTR_MASK, readl(ioaddr + MMC_HIGH_INTR_MASK)); | 75 | MMC_HIGH_INTR_MASK, readl(ioaddr + MMC_HIGH_INTR_MASK)); |
77 | pr_info("\t MMC Low Interrupt Mask (offset 0x%x): 0x%08x\n", | 76 | pr_info("\t MMC Low Interrupt Mask (offset 0x%x): 0x%08x\n", |
78 | MMC_LOW_INTR_MASK, readl(ioaddr + MMC_LOW_INTR_MASK)); | 77 | MMC_LOW_INTR_MASK, readl(ioaddr + MMC_LOW_INTR_MASK)); |
79 | return; | ||
80 | } | 78 | } |
81 | 79 | ||
82 | static void dwmac100_irq_status(unsigned long ioaddr) | 80 | static void dwmac100_irq_status(unsigned long ioaddr) |
@@ -145,7 +143,6 @@ static void dwmac100_set_filter(struct net_device *dev) | |||
145 | "HI 0x%08x, LO 0x%08x\n", | 143 | "HI 0x%08x, LO 0x%08x\n", |
146 | __func__, readl(ioaddr + MAC_CONTROL), | 144 | __func__, readl(ioaddr + MAC_CONTROL), |
147 | readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW)); | 145 | readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW)); |
148 | return; | ||
149 | } | 146 | } |
150 | 147 | ||
151 | static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex, | 148 | static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex, |
@@ -156,8 +153,6 @@ static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex, | |||
156 | if (duplex) | 153 | if (duplex) |
157 | flow |= (pause_time << MAC_FLOW_CTRL_PT_SHIFT); | 154 | flow |= (pause_time << MAC_FLOW_CTRL_PT_SHIFT); |
158 | writel(flow, ioaddr + MAC_FLOW_CTRL); | 155 | writel(flow, ioaddr + MAC_FLOW_CTRL); |
159 | |||
160 | return; | ||
161 | } | 156 | } |
162 | 157 | ||
163 | /* No PMT module supported for this Ethernet Controller. | 158 | /* No PMT module supported for this Ethernet Controller. |