niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

can: c_can: move runtime PM enable/disable to c_can_platform

Browse source 
Currently doing modprobe c_can_pci will make the kernel complain:

    Unbalanced pm_runtime_enable!

this is caused by pm_runtime_enable() called before pm is initialized.

This fix is similar to 227619c3ff, move those pm_enable/disable code
to c_can_platform.

Fixes: 4cdd34b268 ("can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controller")
Link: http://lore.kernel.org/r/20210302025542.987600-1-ztong0001@gmail.com
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Tong Zhang 2021-03-01 21:55:40 -05:00 • committed by Marc Kleine-Budde
parent 0429d6d89f
commit 6e2fe01dd6
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/can/c_can/c_can.c
View file

@ -212,18 +212,6 @@ static const struct can_bittiming_const c_can_bittiming_const = {
.brp_inc = 1, .brp_inc = 1,
}; };
static inline void c_can_pm_runtime_enable(const struct c_can_priv *priv)
{
if (priv->device)
pm_runtime_enable(priv->device);
}
static inline void c_can_pm_runtime_disable(const struct c_can_priv *priv)
{
if (priv->device)
pm_runtime_disable(priv->device);
}
static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv) static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv)
{ {
if (priv->device) if (priv->device)
@ -1335,7 +1323,6 @@ static const struct net_device_ops c_can_netdev_ops = {
int register_c_can_dev(struct net_device *dev) int register_c_can_dev(struct net_device *dev)
{ {
struct c_can_priv *priv = netdev_priv(dev);
int err; int err;
/* Deactivate pins to prevent DRA7 DCAN IP from being /* Deactivate pins to prevent DRA7 DCAN IP from being
@ -1345,28 +1332,19 @@ int register_c_can_dev(struct net_device *dev)
*/ */
pinctrl_pm_select_sleep_state(dev->dev.parent); pinctrl_pm_select_sleep_state(dev->dev.parent);
c_can_pm_runtime_enable(priv);
dev->flags |= IFF_ECHO; /* we support local echo */ dev->flags |= IFF_ECHO; /* we support local echo */
dev->netdev_ops = &c_can_netdev_ops; dev->netdev_ops = &c_can_netdev_ops;
err = register_candev(dev); err = register_candev(dev);
if (err) if (!err)
c_can_pm_runtime_disable(priv);
else
devm_can_led_init(dev); devm_can_led_init(dev);
return err; return err;
} }
EXPORT_SYMBOL_GPL(register_c_can_dev); EXPORT_SYMBOL_GPL(register_c_can_dev);
void unregister_c_can_dev(struct net_device *dev) void unregister_c_can_dev(struct net_device *dev)
{ {
struct c_can_priv *priv = netdev_priv(dev);
unregister_candev(dev); unregister_candev(dev);
c_can_pm_runtime_disable(priv);
} }
EXPORT_SYMBOL_GPL(unregister_c_can_dev); EXPORT_SYMBOL_GPL(unregister_c_can_dev);

6
drivers/net/can/c_can/c_can_platform.c
View file

@ -29,6 +29,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
@ -386,6 +387,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
pm_runtime_enable(priv->device);
ret = register_c_can_dev(dev); ret = register_c_can_dev(dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "registering %s failed (err=%d)\n", dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
@ -398,6 +400,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
return 0; return 0;
exit_free_device: exit_free_device:
pm_runtime_disable(priv->device);
free_c_can_dev(dev); free_c_can_dev(dev);
exit: exit:
dev_err(&pdev->dev, "probe failed\n"); dev_err(&pdev->dev, "probe failed\n");
@ -408,9 +411,10 @@ exit:
static int c_can_plat_remove(struct platform_device *pdev) static int c_can_plat_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct c_can_priv *priv = netdev_priv(dev);
unregister_c_can_dev(dev); unregister_c_can_dev(dev);
pm_runtime_disable(priv->device);
free_c_can_dev(dev); free_c_can_dev(dev);
return 0; return 0;