Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e6831c8 authored by Tong Zhang's avatar Tong Zhang Committed by Greg Kroah-Hartman
Browse files

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

[ Upstream commit 6e2fe01dd6f98da6cae8b07cd5cfa67abc70d97d ]

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 227619c3ff7c, move those pm_enable/disable code
to c_can_platform.

Fixes: 4cdd34b2 ("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: default avatarTong Zhang <ztong0001@gmail.com>
Tested-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b1ed9aef

drivers/net/can/c_can/c_can.c

+1 −23
Original line number Diff line number Diff line
@@ -212,18 +212,6 @@ static const struct can_bittiming_const c_can_bittiming_const = { 
	.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)

{

	if (priv->device)
@@ -1318,7 +1306,6 @@ static const struct net_device_ops c_can_netdev_ops = { 


int register_c_can_dev(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);

	int err;



	/* Deactivate pins to prevent DRA7 DCAN IP from being
@@ -1328,28 +1315,19 @@ int register_c_can_dev(struct net_device *dev) 
	 */

	pinctrl_pm_select_sleep_state(dev->dev.parent);



	c_can_pm_runtime_enable(priv);



	dev->flags |= IFF_ECHO;	/* we support local echo */

	dev->netdev_ops = &c_can_netdev_ops;



	err = register_candev(dev);

	if (err)

		c_can_pm_runtime_disable(priv);

	else

	if (!err)

		devm_can_led_init(dev);



	return err;

}

EXPORT_SYMBOL_GPL(register_c_can_dev);



void unregister_c_can_dev(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);



	unregister_candev(dev);



	c_can_pm_runtime_disable(priv);

}

EXPORT_SYMBOL_GPL(unregister_c_can_dev);

drivers/net/can/c_can/c_can_platform.c

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/list.h>

#include <linux/io.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -385,6 +386,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dev);

	SET_NETDEV_DEV(dev, &pdev->dev);



	pm_runtime_enable(priv->device);

	ret = register_c_can_dev(dev);

	if (ret) {

		dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
@@ -397,6 +399,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	return 0;



exit_free_device:

	pm_runtime_disable(priv->device);

	free_c_can_dev(dev);

exit:

	dev_err(&pdev->dev, "probe failed\n");
@@ -407,9 +410,10 @@ exit: 
static int c_can_plat_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);



	unregister_c_can_dev(dev);



	pm_runtime_disable(priv->device);

	free_c_can_dev(dev);



	return 0;