| Message ID | Zs4UWGKt3hLjNmoP@google.com |
|---|---|
| State | Accepted |
| Commit | e2e75e4202d70086c1061b692da0c979d89f7f9c |
| Headers | show |
| Series | Input: mt6779-keypad - use devm_clk_get_enabled() | expand |
Hi Dmitry Thank you for the patch. On mar., août 27, 2024 at 11:00, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Switch to using devm_clk_get_enable() helper instead of acquiring the > clock with devm_clk_get(), 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: Mattijs Korpershoek <mkorpershoek@baylibre.com> > --- > drivers/input/keyboard/mt6779-keypad.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/input/keyboard/mt6779-keypad.c b/drivers/input/keyboard/mt6779-keypad.c > index 19f69d167fbd..c13880103429 100644 > --- a/drivers/input/keyboard/mt6779-keypad.c > +++ b/drivers/input/keyboard/mt6779-keypad.c > @@ -92,11 +92,6 @@ static irqreturn_t mt6779_keypad_irq_handler(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static void mt6779_keypad_clk_disable(void *data) > -{ > - clk_disable_unprepare(data); > -} > - > static void mt6779_keypad_calc_row_col_single(unsigned int key, > unsigned int *row, > unsigned int *col) > @@ -213,21 +208,10 @@ static int mt6779_keypad_pdrv_probe(struct platform_device *pdev) > regmap_update_bits(keypad->regmap, MTK_KPD_SEL, MTK_KPD_SEL_COL, > MTK_KPD_SEL_COLMASK(keypad->n_cols)); > > - keypad->clk = devm_clk_get(&pdev->dev, "kpd"); > + keypad->clk = devm_clk_get_enabled(&pdev->dev, "kpd"); > if (IS_ERR(keypad->clk)) > return PTR_ERR(keypad->clk); > > - error = clk_prepare_enable(keypad->clk); > - if (error) { > - dev_err(&pdev->dev, "cannot prepare/enable keypad clock\n"); > - return error; > - } > - > - error = devm_add_action_or_reset(&pdev->dev, mt6779_keypad_clk_disable, > - keypad->clk); > - if (error) > - return error; > - > irq = platform_get_irq(pdev, 0); > if (irq < 0) > return irq; > -- > 2.46.0.295.g3b9ea8a38a-goog > > > -- > Dmitry
diff --git a/drivers/input/keyboard/mt6779-keypad.c b/drivers/input/keyboard/mt6779-keypad.c index 19f69d167fbd..c13880103429 100644 --- a/drivers/input/keyboard/mt6779-keypad.c +++ b/drivers/input/keyboard/mt6779-keypad.c @@ -92,11 +92,6 @@ static irqreturn_t mt6779_keypad_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static void mt6779_keypad_clk_disable(void *data) -{ - clk_disable_unprepare(data); -} - static void mt6779_keypad_calc_row_col_single(unsigned int key, unsigned int *row, unsigned int *col) @@ -213,21 +208,10 @@ static int mt6779_keypad_pdrv_probe(struct platform_device *pdev) regmap_update_bits(keypad->regmap, MTK_KPD_SEL, MTK_KPD_SEL_COL, MTK_KPD_SEL_COLMASK(keypad->n_cols)); - keypad->clk = devm_clk_get(&pdev->dev, "kpd"); + keypad->clk = devm_clk_get_enabled(&pdev->dev, "kpd"); if (IS_ERR(keypad->clk)) return PTR_ERR(keypad->clk); - error = clk_prepare_enable(keypad->clk); - if (error) { - dev_err(&pdev->dev, "cannot prepare/enable keypad clock\n"); - return error; - } - - error = devm_add_action_or_reset(&pdev->dev, mt6779_keypad_clk_disable, - keypad->clk); - if (error) - return error; - irq = platform_get_irq(pdev, 0); if (irq < 0) return irq;
Switch to using devm_clk_get_enable() helper instead of acquiring the clock with devm_clk_get(), 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/mt6779-keypad.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)