| Message ID | ZtDDGMaOFlMYjOrt@google.com |
|---|---|
| State | Accepted |
| Commit | 092b7d431f5eb1443cbf0e797858861e2ede1e28 |
| Headers | show |
| Series | Input: snvs_pwrkey - use devm_clk_get_optional_enabled() | expand |
On Thu, Aug 29, 2024 at 11:51:04AM -0700, Dmitry Torokhov wrote: > Switch to using devm_clk_get_optional_enabled() helper instead of > acquiring the clock with devm_clk_get_optional(), enabling it, and > defining and installing a custom devm action to call clk_disable(). > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/input/keyboard/snvs_pwrkey.c | 24 +----------------------- > 1 file changed, 1 insertion(+), 23 deletions(-) > > diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c > index ad8660be0127..f7b5f1e25c80 100644 > --- a/drivers/input/keyboard/snvs_pwrkey.c > +++ b/drivers/input/keyboard/snvs_pwrkey.c > @@ -100,11 +100,6 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static void imx_snvs_pwrkey_disable_clk(void *data) > -{ > - clk_disable_unprepare(data); > -} > - > static void imx_snvs_pwrkey_act(void *pdata) > { > struct pwrkey_drv_data *pd = pdata; > @@ -141,28 +136,12 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > dev_warn(&pdev->dev, "KEY_POWER without setting in dts\n"); > } > > - clk = devm_clk_get_optional(&pdev->dev, NULL); > + clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); > if (IS_ERR(clk)) { > dev_err(&pdev->dev, "Failed to get snvs clock (%pe)\n", clk); > return PTR_ERR(clk); > } > > - error = clk_prepare_enable(clk); > - if (error) { > - dev_err(&pdev->dev, "Failed to enable snvs clock (%pe)\n", > - ERR_PTR(error)); > - return error; > - } > - > - error = devm_add_action_or_reset(&pdev->dev, > - imx_snvs_pwrkey_disable_clk, clk); > - if (error) { > - dev_err(&pdev->dev, > - "Failed to register clock cleanup handler (%pe)\n", > - ERR_PTR(error)); > - return error; > - } > - > pdata->wakeup = of_property_read_bool(np, "wakeup-source"); > > pdata->irq = platform_get_irq(pdev, 0); > @@ -204,7 +183,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > error = devm_request_irq(&pdev->dev, pdata->irq, > imx_snvs_pwrkey_interrupt, > 0, pdev->name, pdev); > - > if (error) { > dev_err(&pdev->dev, "interrupt not available.\n"); > return error; > -- > 2.46.0.469.g59c65b2a67-goog > > > -- > Dmitry
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c index ad8660be0127..f7b5f1e25c80 100644 --- a/drivers/input/keyboard/snvs_pwrkey.c +++ b/drivers/input/keyboard/snvs_pwrkey.c @@ -100,11 +100,6 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static void imx_snvs_pwrkey_disable_clk(void *data) -{ - clk_disable_unprepare(data); -} - static void imx_snvs_pwrkey_act(void *pdata) { struct pwrkey_drv_data *pd = pdata; @@ -141,28 +136,12 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) dev_warn(&pdev->dev, "KEY_POWER without setting in dts\n"); } - clk = devm_clk_get_optional(&pdev->dev, NULL); + clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); if (IS_ERR(clk)) { dev_err(&pdev->dev, "Failed to get snvs clock (%pe)\n", clk); return PTR_ERR(clk); } - error = clk_prepare_enable(clk); - if (error) { - dev_err(&pdev->dev, "Failed to enable snvs clock (%pe)\n", - ERR_PTR(error)); - return error; - } - - error = devm_add_action_or_reset(&pdev->dev, - imx_snvs_pwrkey_disable_clk, clk); - if (error) { - dev_err(&pdev->dev, - "Failed to register clock cleanup handler (%pe)\n", - ERR_PTR(error)); - return error; - } - pdata->wakeup = of_property_read_bool(np, "wakeup-source"); pdata->irq = platform_get_irq(pdev, 0); @@ -204,7 +183,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) error = devm_request_irq(&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt, 0, pdev->name, pdev); - if (error) { dev_err(&pdev->dev, "interrupt not available.\n"); return error;
Switch to using devm_clk_get_optional_enabled() helper instead of acquiring the clock with devm_clk_get_optional(), enabling it, and defining and installing a custom devm action to call clk_disable(). Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/keyboard/snvs_pwrkey.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-)