From: Geert Uytterhoeven <geert+renesas@glider.be> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Vignesh Raghavendra <vigneshr@ti.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Mark Brown <broonie@kernel.org> Cc: Philipp Zabel <p.zabel@pengutronix.de>, Sergey Shtylyov <s.shtylyov@omp.ru>, Wolfram Sang <wsa+renesas@sang-engineering.com>, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-spi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v2 4/6] memory: renesas-rpc-if: Improve Runtime PM handling Date: Wed, 23 Nov 2022 15:41:20 +0100 [thread overview] Message-ID: <6f2bd3b2b3d98c5bed541d969900b2ad04f93943.1669213027.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1669213027.git.geert+renesas@glider.be> Convert from the deprecated pm_runtime_get_sync() to the new pm_runtime_resume_and_get(), and add error checking. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - No changes. --- drivers/memory/renesas-rpc-if.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c index 83171242f9514c22..9346dcc29a36662e 100644 --- a/drivers/memory/renesas-rpc-if.c +++ b/drivers/memory/renesas-rpc-if.c @@ -304,12 +304,13 @@ int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash) { struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); u32 dummy; + int ret; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret) + return ret; if (rpc->type == RPCIF_RZ_G2L) { - int ret; - ret = reset_control_reset(rpc->rstc); if (ret) return ret; @@ -482,7 +483,9 @@ int rpcif_manual_xfer(struct rpcif *rpcif) u32 smenr, smcr, pos = 0, max = rpc->bus_size == 2 ? 8 : 4; int ret = 0; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret < 0) + return ret; regmap_update_bits(rpc->regmap, RPCIF_PHYCNT, RPCIF_PHYCNT_CAL, RPCIF_PHYCNT_CAL); @@ -650,11 +653,14 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf) struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); loff_t from = offs & (rpc->size - 1); size_t size = rpc->size - from; + int ret; if (len > size) len = size; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret < 0) + return ret; regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MD, 0); regmap_write(rpc->regmap, RPCIF_DRCR, 0); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Vignesh Raghavendra <vigneshr@ti.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Mark Brown <broonie@kernel.org> Cc: Philipp Zabel <p.zabel@pengutronix.de>, Sergey Shtylyov <s.shtylyov@omp.ru>, Wolfram Sang <wsa+renesas@sang-engineering.com>, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-spi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v2 4/6] memory: renesas-rpc-if: Improve Runtime PM handling Date: Wed, 23 Nov 2022 15:41:20 +0100 [thread overview] Message-ID: <6f2bd3b2b3d98c5bed541d969900b2ad04f93943.1669213027.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1669213027.git.geert+renesas@glider.be> Convert from the deprecated pm_runtime_get_sync() to the new pm_runtime_resume_and_get(), and add error checking. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - No changes. --- drivers/memory/renesas-rpc-if.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c index 83171242f9514c22..9346dcc29a36662e 100644 --- a/drivers/memory/renesas-rpc-if.c +++ b/drivers/memory/renesas-rpc-if.c @@ -304,12 +304,13 @@ int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash) { struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); u32 dummy; + int ret; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret) + return ret; if (rpc->type == RPCIF_RZ_G2L) { - int ret; - ret = reset_control_reset(rpc->rstc); if (ret) return ret; @@ -482,7 +483,9 @@ int rpcif_manual_xfer(struct rpcif *rpcif) u32 smenr, smcr, pos = 0, max = rpc->bus_size == 2 ? 8 : 4; int ret = 0; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret < 0) + return ret; regmap_update_bits(rpc->regmap, RPCIF_PHYCNT, RPCIF_PHYCNT_CAL, RPCIF_PHYCNT_CAL); @@ -650,11 +653,14 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf) struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); loff_t from = offs & (rpc->size - 1); size_t size = rpc->size - from; + int ret; if (len > size) len = size; - pm_runtime_get_sync(rpc->dev); + ret = pm_runtime_resume_and_get(rpc->dev); + if (ret < 0) + return ret; regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MD, 0); regmap_write(rpc->regmap, RPCIF_DRCR, 0); -- 2.25.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-11-23 14:41 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-23 14:41 [PATCH v2 0/6] memory: renesas-rpc-if: Rebind fixes and misc cleanups Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-23 14:41 ` [PATCH v2 1/6] memory: renesas-rpc-if: Split-off private data from struct rpcif Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-23 14:41 ` [PATCH v2 2/6] memory: renesas-rpc-if: Move resource acquisition to .probe() Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-23 14:41 ` [PATCH v2 3/6] memory: renesas-rpc-if: Always use dev in rpcif_probe() Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven [this message] 2022-11-23 14:41 ` [PATCH v2 4/6] memory: renesas-rpc-if: Improve Runtime PM handling Geert Uytterhoeven 2022-11-23 14:41 ` [PATCH v2 5/6] memory: renesas-rpc-if: Pass device instead of rpcif to rpcif_*() Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-23 14:43 ` Mark Brown 2022-11-23 14:43 ` Mark Brown 2022-11-23 14:41 ` [PATCH v2 6/6] memory: renesas-rpc-if: Remove Runtime PM wrappers Geert Uytterhoeven 2022-11-23 14:41 ` Geert Uytterhoeven 2022-11-27 21:31 ` [PATCH v2 0/6] memory: renesas-rpc-if: Rebind fixes and misc cleanups Krzysztof Kozlowski 2022-11-27 21:31 ` Krzysztof Kozlowski 2022-11-27 21:34 ` Krzysztof Kozlowski 2022-11-27 21:34 ` Krzysztof Kozlowski 2022-11-28 7:37 ` Geert Uytterhoeven 2022-11-28 7:37 ` Geert Uytterhoeven 2022-12-05 8:56 ` Wolfram Sang 2022-12-05 8:56 ` Wolfram Sang 2022-12-27 8:59 ` Krzysztof Kozlowski 2022-12-27 8:59 ` Krzysztof Kozlowski 2022-12-27 9:06 ` Krzysztof Kozlowski 2022-12-27 9:06 ` Krzysztof Kozlowski 2022-12-27 9:09 ` Geert Uytterhoeven 2022-12-27 9:09 ` Geert Uytterhoeven
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=6f2bd3b2b3d98c5bed541d969900b2ad04f93943.1669213027.git.geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=broonie@kernel.org \ --cc=krzysztof.kozlowski@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=miquel.raynal@bootlin.com \ --cc=p.zabel@pengutronix.de \ --cc=richard@nod.at \ --cc=s.shtylyov@omp.ru \ --cc=vigneshr@ti.com \ --cc=wsa+renesas@sang-engineering.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.