mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 23:24:50 +00:00
mv643xx_eth: Fix compile error for architectures without clk.
Commit 452503ebc
(ARM: Orion: Eth: Add clk/clkdev support.) broke
the building of the driver on architectures which don't have clk
support. In particular PPC32 Pegasos which uses this driver.
Add #ifdef around the clk API usage.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ba27ec66ff
commit
9a43a02648
1 changed files with 10 additions and 5 deletions
|
@ -436,7 +436,9 @@ struct mv643xx_eth_private {
|
||||||
/*
|
/*
|
||||||
* Hardware-specific parameters.
|
* Hardware-specific parameters.
|
||||||
*/
|
*/
|
||||||
|
#if defined(CONFIG_HAVE_CLK)
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
|
#endif
|
||||||
unsigned int t_clk;
|
unsigned int t_clk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2895,17 +2897,17 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
|
||||||
mp->dev = dev;
|
mp->dev = dev;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the clk rate, if there is one, otherwise use the default.
|
* Start with a default rate, and if there is a clock, allow
|
||||||
|
* it to override the default.
|
||||||
*/
|
*/
|
||||||
|
mp->t_clk = 133000000;
|
||||||
|
#if defined(CONFIG_HAVE_CLK)
|
||||||
mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));
|
mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));
|
||||||
if (!IS_ERR(mp->clk)) {
|
if (!IS_ERR(mp->clk)) {
|
||||||
clk_prepare_enable(mp->clk);
|
clk_prepare_enable(mp->clk);
|
||||||
mp->t_clk = clk_get_rate(mp->clk);
|
mp->t_clk = clk_get_rate(mp->clk);
|
||||||
} else {
|
|
||||||
mp->t_clk = 133000000;
|
|
||||||
printk(KERN_WARNING "Unable to get clock");
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
set_params(mp, pd);
|
set_params(mp, pd);
|
||||||
netif_set_real_num_tx_queues(dev, mp->txq_count);
|
netif_set_real_num_tx_queues(dev, mp->txq_count);
|
||||||
netif_set_real_num_rx_queues(dev, mp->rxq_count);
|
netif_set_real_num_rx_queues(dev, mp->rxq_count);
|
||||||
|
@ -2995,10 +2997,13 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
|
||||||
phy_detach(mp->phy);
|
phy_detach(mp->phy);
|
||||||
cancel_work_sync(&mp->tx_timeout_task);
|
cancel_work_sync(&mp->tx_timeout_task);
|
||||||
|
|
||||||
|
#if defined(CONFIG_HAVE_CLK)
|
||||||
if (!IS_ERR(mp->clk)) {
|
if (!IS_ERR(mp->clk)) {
|
||||||
clk_disable_unprepare(mp->clk);
|
clk_disable_unprepare(mp->clk);
|
||||||
clk_put(mp->clk);
|
clk_put(mp->clk);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
free_netdev(mp->dev);
|
free_netdev(mp->dev);
|
||||||
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
|
|
Loading…
Reference in a new issue