From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Tong Zhang <ztong0001@gmail.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
Oliver Hartkopp <socketcan@hartkopp.net>,
YueHaibing <yuehaibing@huawei.com>,
Zhang Qilong <zhangqilong3@huawei.com>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] can: c_can: move runtime PM enable/disable to c_can_platform
Date: Mon, 1 Mar 2021 16:08:40 +0100 [thread overview]
Message-ID: <20210301150840.mqngl7og46o3nxjb@pengutronix.de> (raw)
In-Reply-To: <20210301041550.795500-1-ztong0001@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2776 bytes --]
On 28.02.2021 23:15:48, Tong Zhang wrote:
> Currently doing modprobe c_can_pci will make kernel complain
> "Unbalanced pm_runtime_enable!", this is caused by pm_runtime_enable()
> called before pm is initialized in register_candev() and doing so will
I don't see where register_candev() is doing any pm related
initialization.
> also cause it to enable twice.
> This fix is similar to 227619c3ff7c, move those pm_enable/disable code to
> c_can_platform.
As I understand 227619c3ff7c ("can: m_can: move runtime PM
enable/disable to m_can_platform"), PCI devices automatically enable PM,
when the "PCI device is added".
Please clarify the above point, otherwise the code looks OK, small
nitpick inline:
> Signed-off-by: Tong Zhang <ztong0001@gmail.com>
> ---
> drivers/net/can/c_can/c_can.c | 26 ++------------------------
> drivers/net/can/c_can/c_can_platform.c | 6 +++++-
> 2 files changed, 7 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
> index ef474bae47a1..04f783b3d9d3 100644
> --- a/drivers/net/can/c_can/c_can.c
> +++ b/drivers/net/can/c_can/c_can.c
> @@ -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)
> @@ -1335,7 +1323,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
> @@ -1345,28 +1332,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
> - devm_can_led_init(dev);
> -
> + if (!err)
> + devm_can_led_init(dev);
Please indent with two tabs here.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-01 19:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 4:15 [PATCH] can: c_can: move runtime PM enable/disable to c_can_platform Tong Zhang
2021-03-01 15:08 ` Marc Kleine-Budde [this message]
2021-03-02 2:55 ` [PATCH v2] " Tong Zhang
2021-03-02 7:26 ` Marc Kleine-Budde
2021-03-05 11:32 ` Uwe Kleine-König
2021-03-02 2:55 ` [PATCH] " Tong Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210301150840.mqngl7og46o3nxjb@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=netdev@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=wg@grandegger.com \
--cc=yuehaibing@huawei.com \
--cc=zhangqilong3@huawei.com \
--cc=ztong0001@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).