diff options
author | Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2016-08-09 19:22:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-10 20:27:39 -0400 |
commit | ef4183a1d75b15c3bbd6e7f2b14fc5480d740bff (patch) | |
tree | ea4defb3d2d7b19180d4581011e8bf43251c1420 /drivers/net/ethernet/ti | |
parent | 6f1f58361fa249ce10ca14256e473e6881e4efee (diff) |
net: ethernet: ti: cpsw: remove clk var from priv
There is no need to hold link to clk, it's used only once
while probe.
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
-rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 4f6a4c100810..0b6958d6834e 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -379,7 +379,6 @@ struct cpsw_priv { | |||
379 | u32 coal_intvl; | 379 | u32 coal_intvl; |
380 | u32 bus_freq_mhz; | 380 | u32 bus_freq_mhz; |
381 | int rx_packet_max; | 381 | int rx_packet_max; |
382 | struct clk *clk; | ||
383 | u8 mac_addr[ETH_ALEN]; | 382 | u8 mac_addr[ETH_ALEN]; |
384 | struct cpsw_slave *slaves; | 383 | struct cpsw_slave *slaves; |
385 | struct cpdma_ctlr *dma; | 384 | struct cpdma_ctlr *dma; |
@@ -2177,8 +2176,6 @@ static int cpsw_probe_dual_emac(struct platform_device *pdev, | |||
2177 | memcpy(ndev->dev_addr, priv_sl2->mac_addr, ETH_ALEN); | 2176 | memcpy(ndev->dev_addr, priv_sl2->mac_addr, ETH_ALEN); |
2178 | 2177 | ||
2179 | priv_sl2->slaves = priv->slaves; | 2178 | priv_sl2->slaves = priv->slaves; |
2180 | priv_sl2->clk = priv->clk; | ||
2181 | |||
2182 | priv_sl2->coal_intvl = 0; | 2179 | priv_sl2->coal_intvl = 0; |
2183 | priv_sl2->bus_freq_mhz = priv->bus_freq_mhz; | 2180 | priv_sl2->bus_freq_mhz = priv->bus_freq_mhz; |
2184 | 2181 | ||
@@ -2256,6 +2253,7 @@ MODULE_DEVICE_TABLE(of, cpsw_of_mtable); | |||
2256 | 2253 | ||
2257 | static int cpsw_probe(struct platform_device *pdev) | 2254 | static int cpsw_probe(struct platform_device *pdev) |
2258 | { | 2255 | { |
2256 | struct clk *clk; | ||
2259 | struct cpsw_platform_data *data; | 2257 | struct cpsw_platform_data *data; |
2260 | struct net_device *ndev; | 2258 | struct net_device *ndev; |
2261 | struct cpsw_priv *priv; | 2259 | struct cpsw_priv *priv; |
@@ -2334,14 +2332,14 @@ static int cpsw_probe(struct platform_device *pdev) | |||
2334 | priv->slaves[0].ndev = ndev; | 2332 | priv->slaves[0].ndev = ndev; |
2335 | priv->emac_port = 0; | 2333 | priv->emac_port = 0; |
2336 | 2334 | ||
2337 | priv->clk = devm_clk_get(&pdev->dev, "fck"); | 2335 | clk = devm_clk_get(&pdev->dev, "fck"); |
2338 | if (IS_ERR(priv->clk)) { | 2336 | if (IS_ERR(clk)) { |
2339 | dev_err(priv->dev, "fck is not found\n"); | 2337 | dev_err(priv->dev, "fck is not found\n"); |
2340 | ret = -ENODEV; | 2338 | ret = -ENODEV; |
2341 | goto clean_runtime_disable_ret; | 2339 | goto clean_runtime_disable_ret; |
2342 | } | 2340 | } |
2343 | priv->coal_intvl = 0; | 2341 | priv->coal_intvl = 0; |
2344 | priv->bus_freq_mhz = clk_get_rate(priv->clk) / 1000000; | 2342 | priv->bus_freq_mhz = clk_get_rate(clk) / 1000000; |
2345 | 2343 | ||
2346 | ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2344 | ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
2347 | ss_regs = devm_ioremap_resource(&pdev->dev, ss_res); | 2345 | ss_regs = devm_ioremap_resource(&pdev->dev, ss_res); |