net: lpc_eth: fix warnings caused by enabling unprepared clock
If common clock framework is configured, the driver generates warnings, which are fixed by this change: WARNING: CPU: 0 PID: 1 at linux/drivers/clk/clk.c:727 clk_core_enable+0x2c/0xa4() Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 4.3.0-rc2+ #141 Hardware name: LPC32XX SoC (Flattened Device Tree) Backtrace: [<>] (dump_backtrace) from [<>] (show_stack+0x18/0x1c) [<>] (show_stack) from [<>] (dump_stack+0x20/0x28) [<>] (dump_stack) from [<>] (warn_slowpath_common+0x90/0xb8) [<>] (warn_slowpath_common) from [<>] (warn_slowpath_null+0x24/0x2c) [<>] (warn_slowpath_null) from [<>] (clk_core_enable+0x2c/0xa4) [<>] (clk_core_enable) from [<>] (clk_enable+0x24/0x38) [<>] (clk_enable) from [<>] (lpc_eth_drv_probe+0xfc/0x99c) [<>] (lpc_eth_drv_probe) from [<>] (platform_drv_probe+0x50/0xa0) [<>] (platform_drv_probe) from [<>] (driver_probe_device+0x18c/0x408) [<>] (driver_probe_device) from [<>] (__driver_attach+0x70/0x94) [<>] (__driver_attach) from [<>] (bus_for_each_dev+0x74/0x98) [<>] (bus_for_each_dev) from [<>] (driver_attach+0x20/0x28) [<>] (driver_attach) from [<>] (bus_add_driver+0x11c/0x248) [<>] (bus_add_driver) from [<>] (driver_register+0xa4/0xe8) [<>] (driver_register) from [<>] (__platform_driver_register+0x50/0x64) [<>] (__platform_driver_register) from [<>] (lpc_eth_driver_init+0x18/0x20) [<>] (lpc_eth_driver_init) from [<>] (do_one_initcall+0x11c/0x1dc) [<>] (do_one_initcall) from [<>] (kernel_init_freeable+0x10c/0x1d4) [<>] (kernel_init_freeable) from [<>] (kernel_init+0x10/0xec) [<>] (kernel_init) from [<>] (ret_from_fork+0x14/0x24) Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
f6194bcf03
Коммит
33a8316d9c
|
@ -476,13 +476,12 @@ static void __lpc_get_mac(struct netdata_local *pldat, u8 *mac)
|
||||||
mac[5] = tmp >> 8;
|
mac[5] = tmp >> 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __lpc_eth_clock_enable(struct netdata_local *pldat,
|
static void __lpc_eth_clock_enable(struct netdata_local *pldat, bool enable)
|
||||||
bool enable)
|
|
||||||
{
|
{
|
||||||
if (enable)
|
if (enable)
|
||||||
clk_enable(pldat->clk);
|
clk_prepare_enable(pldat->clk);
|
||||||
else
|
else
|
||||||
clk_disable(pldat->clk);
|
clk_disable_unprepare(pldat->clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __lpc_params_setup(struct netdata_local *pldat)
|
static void __lpc_params_setup(struct netdata_local *pldat)
|
||||||
|
@ -1494,7 +1493,7 @@ err_out_free_irq:
|
||||||
err_out_iounmap:
|
err_out_iounmap:
|
||||||
iounmap(pldat->net_base);
|
iounmap(pldat->net_base);
|
||||||
err_out_disable_clocks:
|
err_out_disable_clocks:
|
||||||
clk_disable(pldat->clk);
|
clk_disable_unprepare(pldat->clk);
|
||||||
clk_put(pldat->clk);
|
clk_put(pldat->clk);
|
||||||
err_out_free_dev:
|
err_out_free_dev:
|
||||||
free_netdev(ndev);
|
free_netdev(ndev);
|
||||||
|
@ -1519,7 +1518,7 @@ static int lpc_eth_drv_remove(struct platform_device *pdev)
|
||||||
iounmap(pldat->net_base);
|
iounmap(pldat->net_base);
|
||||||
mdiobus_unregister(pldat->mii_bus);
|
mdiobus_unregister(pldat->mii_bus);
|
||||||
mdiobus_free(pldat->mii_bus);
|
mdiobus_free(pldat->mii_bus);
|
||||||
clk_disable(pldat->clk);
|
clk_disable_unprepare(pldat->clk);
|
||||||
clk_put(pldat->clk);
|
clk_put(pldat->clk);
|
||||||
free_netdev(ndev);
|
free_netdev(ndev);
|
||||||
|
|
||||||
|
@ -1540,7 +1539,7 @@ static int lpc_eth_drv_suspend(struct platform_device *pdev,
|
||||||
if (netif_running(ndev)) {
|
if (netif_running(ndev)) {
|
||||||
netif_device_detach(ndev);
|
netif_device_detach(ndev);
|
||||||
__lpc_eth_shutdown(pldat);
|
__lpc_eth_shutdown(pldat);
|
||||||
clk_disable(pldat->clk);
|
clk_disable_unprepare(pldat->clk);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reset again now clock is disable to be sure
|
* Reset again now clock is disable to be sure
|
||||||
|
|
Загрузка…
Ссылка в новой задаче