From: Patrik Flykt <patrik.flykt@linux.intel.com>
To: linux-can@vger.kernel.org
Cc: wg@grandegger.com, mkl@pengutronix.de, dmurphy@ti.com,
sriram.dash@samsung.com, jarkko.nikula@intel.com
Subject: [PATCH 1/1] NET: mcan: Move runtime PM enable/disable to m_can_platform
Date: Tue, 25 Aug 2020 13:17:36 +0300 [thread overview]
Message-ID: <20200825101736.158578-2-patrik.flykt@linux.intel.com> (raw)
In-Reply-To: <20200825101736.158578-1-patrik.flykt@linux.intel.com>
This is a preparatory patch for upcoming PCI based M_CAN devices.
The current PM implementation would cause PCI based drivers to
enable PM twice, once when the pci device is added and a second
time in m_can_class_register(). This will cause 'Unbalanced
pm_runtime_enable!' to be logged, and is a situation that should
be avoided.
Therefore, in anticipation of PCI devices, move PM enabling out
from M_CAN class registration to its currently only user, the
m_can_platform driver.
Signed-off-by: Patrik Flykt <patrik.flykt@linux.intel.com>
---
drivers/net/can/m_can/m_can.c | 6 +-----
drivers/net/can/m_can/m_can_platform.c | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 02c5795b7393..2c4d74113443 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1817,7 +1817,6 @@ int m_can_class_register(struct m_can_classdev *m_can_dev)
int ret;
if (m_can_dev->pm_clock_support) {
- pm_runtime_enable(m_can_dev->dev);
ret = m_can_clk_start(m_can_dev);
if (ret)
goto pm_runtime_fail;
@@ -1847,11 +1846,8 @@ int m_can_class_register(struct m_can_classdev *m_can_dev)
clk_disable:
m_can_clk_stop(m_can_dev);
pm_runtime_fail:
- if (ret) {
- if (m_can_dev->pm_clock_support)
- pm_runtime_disable(m_can_dev->dev);
+ if (ret)
free_candev(m_can_dev->net);
- }
return ret;
}
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index 38ea5e600fb8..1260e99b9322 100644
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -111,7 +111,10 @@ static int m_can_plat_probe(struct platform_device *pdev)
m_can_init_ram(mcan_class);
+ pm_runtime_enable(mcan_class->dev);
ret = m_can_class_register(mcan_class);
+ if (ret)
+ pm_runtime_disable(mcan_class->dev);
failed_ret:
return ret;
--
2.27.0
next prev parent reply other threads:[~2020-08-25 10:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 10:17 [PATCH 0/1] NET: mcan: Move runtime PM enable/disable to m_can_platform Patrik Flykt
2020-08-25 10:17 ` Patrik Flykt [this message]
2020-09-01 18:22 ` [PATCH 1/1] " Dan Murphy
2020-10-19 15:01 ` Patrik Flykt
2020-10-19 15:47 ` Marc Kleine-Budde
2020-10-23 11:58 ` Patrik Flykt
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=20200825101736.158578-2-patrik.flykt@linux.intel.com \
--to=patrik.flykt@linux.intel.com \
--cc=dmurphy@ti.com \
--cc=jarkko.nikula@intel.com \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=sriram.dash@samsung.com \
--cc=wg@grandegger.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).