diff options
author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-12-17 11:02:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-19 11:07:16 -0500 |
commit | 7555001546bac9247e893d84236365a205f2bad2 (patch) | |
tree | bd5cdcdcd3840f51bbfe17c3307540973a0189cd | |
parent | 8e6d60435da8a911b67c36b17ff0319162e29563 (diff) |
bcm63xx_enet: just use "enet" as the clock name
Now that we have the individual clocks available as "enet" we
don't need to rely on the device id for them anymore.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index d9346e2ac720..5a5886345da2 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
@@ -1716,7 +1716,6 @@ static int bcm_enet_probe(struct platform_device *pdev) | |||
1716 | struct bcm63xx_enet_platform_data *pd; | 1716 | struct bcm63xx_enet_platform_data *pd; |
1717 | struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; | 1717 | struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; |
1718 | struct mii_bus *bus; | 1718 | struct mii_bus *bus; |
1719 | const char *clk_name; | ||
1720 | int i, ret; | 1719 | int i, ret; |
1721 | 1720 | ||
1722 | if (!bcm_enet_shared_base[0]) | 1721 | if (!bcm_enet_shared_base[0]) |
@@ -1757,14 +1756,12 @@ static int bcm_enet_probe(struct platform_device *pdev) | |||
1757 | if (priv->mac_id == 0) { | 1756 | if (priv->mac_id == 0) { |
1758 | priv->rx_chan = 0; | 1757 | priv->rx_chan = 0; |
1759 | priv->tx_chan = 1; | 1758 | priv->tx_chan = 1; |
1760 | clk_name = "enet0"; | ||
1761 | } else { | 1759 | } else { |
1762 | priv->rx_chan = 2; | 1760 | priv->rx_chan = 2; |
1763 | priv->tx_chan = 3; | 1761 | priv->tx_chan = 3; |
1764 | clk_name = "enet1"; | ||
1765 | } | 1762 | } |
1766 | 1763 | ||
1767 | priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); | 1764 | priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); |
1768 | if (IS_ERR(priv->mac_clk)) { | 1765 | if (IS_ERR(priv->mac_clk)) { |
1769 | ret = PTR_ERR(priv->mac_clk); | 1766 | ret = PTR_ERR(priv->mac_clk); |
1770 | goto out; | 1767 | goto out; |