| Message ID | 20240923115743.3563079-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d505d3593b52b6c43507f119572409087416ba28 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] net: wwan: qcom_bam_dmux: Fix missing pm_runtime_disable() | expand |
On Mon, Sep 23, 2024 at 07:57:43PM +0800, Jinjie Ruan wrote: > It's important to undo pm_runtime_use_autosuspend() with > pm_runtime_dont_use_autosuspend() at driver exit time. > > But the pm_runtime_disable() and pm_runtime_dont_use_autosuspend() > is missing in the error path for bam_dmux_probe(). So add it. > > Found by code review. Compile-tested only. > > Fixes: 21a0ffd9b38c ("net: wwan: Add Qualcomm BAM-DMUX WWAN network driver") > Suggested-by: Stephan Gerhold <stephan.gerhold@linaro.org> > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> Thanks for making the changes! Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org> > --- > v2: > - Drop the unneeded pm_runtime_set_suspended(). > - Add Suggested-by. > - Update the commit message. > --- > drivers/net/wwan/qcom_bam_dmux.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c > index 26ca719fa0de..5dcb9a84a12e 100644 > --- a/drivers/net/wwan/qcom_bam_dmux.c > +++ b/drivers/net/wwan/qcom_bam_dmux.c > @@ -823,17 +823,17 @@ static int bam_dmux_probe(struct platform_device *pdev) > ret = devm_request_threaded_irq(dev, pc_ack_irq, NULL, bam_dmux_pc_ack_irq, > IRQF_ONESHOT, NULL, dmux); > if (ret) > - return ret; > + goto err_disable_pm; > > ret = devm_request_threaded_irq(dev, dmux->pc_irq, NULL, bam_dmux_pc_irq, > IRQF_ONESHOT, NULL, dmux); > if (ret) > - return ret; > + goto err_disable_pm; > > ret = irq_get_irqchip_state(dmux->pc_irq, IRQCHIP_STATE_LINE_LEVEL, > &dmux->pc_state); > if (ret) > - return ret; > + goto err_disable_pm; > > /* Check if remote finished initialization before us */ > if (dmux->pc_state) { > @@ -844,6 +844,11 @@ static int bam_dmux_probe(struct platform_device *pdev) > } > > return 0; > + > +err_disable_pm: > + pm_runtime_disable(dev); > + pm_runtime_dont_use_autosuspend(dev); > + return ret; > } > > static void bam_dmux_remove(struct platform_device *pdev) > -- > 2.34.1 >
On 23.09.2024 14:57, Jinjie Ruan wrote: > It's important to undo pm_runtime_use_autosuspend() with > pm_runtime_dont_use_autosuspend() at driver exit time. > > But the pm_runtime_disable() and pm_runtime_dont_use_autosuspend() > is missing in the error path for bam_dmux_probe(). So add it. > > Found by code review. Compile-tested only. > > Fixes: 21a0ffd9b38c ("net: wwan: Add Qualcomm BAM-DMUX WWAN network driver") > Suggested-by: Stephan Gerhold <stephan.gerhold@linaro.org> > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> Reviewed-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 23 Sep 2024 19:57:43 +0800 you wrote: > It's important to undo pm_runtime_use_autosuspend() with > pm_runtime_dont_use_autosuspend() at driver exit time. > > But the pm_runtime_disable() and pm_runtime_dont_use_autosuspend() > is missing in the error path for bam_dmux_probe(). So add it. > > Found by code review. Compile-tested only. > > [...] Here is the summary with links: - [v2] net: wwan: qcom_bam_dmux: Fix missing pm_runtime_disable() https://git.kernel.org/netdev/net/c/d505d3593b52 You are awesome, thank you!
diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c index 26ca719fa0de..5dcb9a84a12e 100644 --- a/drivers/net/wwan/qcom_bam_dmux.c +++ b/drivers/net/wwan/qcom_bam_dmux.c @@ -823,17 +823,17 @@ static int bam_dmux_probe(struct platform_device *pdev) ret = devm_request_threaded_irq(dev, pc_ack_irq, NULL, bam_dmux_pc_ack_irq, IRQF_ONESHOT, NULL, dmux); if (ret) - return ret; + goto err_disable_pm; ret = devm_request_threaded_irq(dev, dmux->pc_irq, NULL, bam_dmux_pc_irq, IRQF_ONESHOT, NULL, dmux); if (ret) - return ret; + goto err_disable_pm; ret = irq_get_irqchip_state(dmux->pc_irq, IRQCHIP_STATE_LINE_LEVEL, &dmux->pc_state); if (ret) - return ret; + goto err_disable_pm; /* Check if remote finished initialization before us */ if (dmux->pc_state) { @@ -844,6 +844,11 @@ static int bam_dmux_probe(struct platform_device *pdev) } return 0; + +err_disable_pm: + pm_runtime_disable(dev); + pm_runtime_dont_use_autosuspend(dev); + return ret; } static void bam_dmux_remove(struct platform_device *pdev)
It's important to undo pm_runtime_use_autosuspend() with pm_runtime_dont_use_autosuspend() at driver exit time. But the pm_runtime_disable() and pm_runtime_dont_use_autosuspend() is missing in the error path for bam_dmux_probe(). So add it. Found by code review. Compile-tested only. Fixes: 21a0ffd9b38c ("net: wwan: Add Qualcomm BAM-DMUX WWAN network driver") Suggested-by: Stephan Gerhold <stephan.gerhold@linaro.org> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- v2: - Drop the unneeded pm_runtime_set_suspended(). - Add Suggested-by. - Update the commit message. --- drivers/net/wwan/qcom_bam_dmux.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)