Re: [PATCH v3 3/4] Input: snvs_pwrkey - use local device pointer to simple code

[Frank Li <Frank.li@oss.nxp.com>]

On Mon, Jun 15, 2026 at 03:52:16PM +0800, joy.zou@oss.nxp.com wrote:
> [You don't often get email from joy.zou@oss.nxp.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> From: Joy Zou <joy.zou@nxp.com>
>
> Use local struct device pointer to avoid reference the platform_device
> pointer every time.
>
> No functional change.
>
> Signed-off-by: Joy Zou <joy.zou@nxp.com>
> ---
> Changes for v2:
> 1. Use dev instead of &pdev->dev for devm_input_allocate_device(),
>    which was missed in patch v1 per AI review comments.
> 2. Modify commit message.
> ---
>  drivers/input/keyboard/snvs_pwrkey.c | 41 ++++++++++++++++++------------------
>  1 file changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
> index a291812e6d22..4a1d04898482 100644
> --- a/drivers/input/keyboard/snvs_pwrkey.c
> +++ b/drivers/input/keyboard/snvs_pwrkey.c
> @@ -112,6 +112,7 @@ static void imx_snvs_pwrkey_act(void *pdata)
>
>  static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
>  {
> +       struct device *dev = &pdev->dev;
>         struct pwrkey_drv_data *pdata;
>         struct input_dev *input;
>         struct device_node *np;
> @@ -122,26 +123,26 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
>         u32 vid;
>
>         /* Get SNVS register Page */
> -       np = pdev->dev.of_node;
> +       np = dev->of_node;
>         if (!np)
> -               return dev_err_probe(&pdev->dev, -ENODEV, "Device tree node not found\n");
> +               return dev_err_probe(dev, -ENODEV, "Device tree node not found\n");
>
> -       pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
> +       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
>         if (!pdata)
>                 return -ENOMEM;
>
>         pdata->snvs = syscon_regmap_lookup_by_phandle(np, "regmap");
>         if (IS_ERR(pdata->snvs))
> -               return dev_err_probe(&pdev->dev, PTR_ERR(pdata->snvs), "Can't get snvs syscon\n");
> +               return dev_err_probe(dev, PTR_ERR(pdata->snvs), "Can't get snvs syscon\n");
>
>         if (of_property_read_u32(np, "linux,keycode", &pdata->keycode)) {
>                 pdata->keycode = KEY_POWER;
> -               dev_warn(&pdev->dev, "KEY_POWER without setting in dts\n");
> +               dev_warn(dev, "KEY_POWER without setting in dts\n");
>         }
>
> -       clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
> +       clk = devm_clk_get_optional_enabled(dev, NULL);
>         if (IS_ERR(clk))
> -               return dev_err_probe(&pdev->dev, PTR_ERR(clk),
> +               return dev_err_probe(dev, PTR_ERR(clk),
>                                      "Failed to get snvs clock (%pe)\n", clk);
>
>         pdata->wakeup = of_property_read_bool(np, "wakeup-source");
> @@ -162,7 +163,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
>                         bpt = (val / 5) - 1;
>                         break;
>                 default:
> -                       return dev_err_probe(&pdev->dev, -EINVAL,
> +                       return dev_err_probe(dev, -EINVAL,
>                                              "power-off-time-sec %d out of range\n", val);
>                 }
>
> @@ -180,9 +181,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
>
>         timer_setup(&pdata->check_timer, imx_imx_snvs_check_for_events, 0);
>
> -       input = devm_input_allocate_device(&pdev->dev);
> +       input = devm_input_allocate_device(dev);
>         if (!input) {
> -               dev_err(&pdev->dev, "failed to allocate the input device\n");
> +               dev_err(dev, "failed to allocate the input device\n");
>                 return -ENOMEM;

look like you missed this one changeing to dev_err_probe() at patch 1.

Frank

>         }
>
> @@ -193,27 +194,27 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
>         input_set_capability(input, EV_KEY, pdata->keycode);
>
>         /* input customer action to cancel release timer */
> -       error = devm_add_action(&pdev->dev, imx_snvs_pwrkey_act, pdata);
> +       error = devm_add_action(dev, imx_snvs_pwrkey_act, pdata);
>         if (error)
> -               return dev_err_probe(&pdev->dev, error, "failed to register remove action\n");
> +               return dev_err_probe(dev, error, "failed to register remove action\n");
>
>         pdata->input = input;
>         platform_set_drvdata(pdev, pdata);
>
> -       error = devm_request_irq(&pdev->dev, pdata->irq,
> -                              imx_snvs_pwrkey_interrupt,
> -                              0, pdev->name, pdev);
> +       error = devm_request_irq(dev, pdata->irq,
> +                                imx_snvs_pwrkey_interrupt,
> +                                0, pdev->name, pdev);
>         if (error)
> -               return dev_err_probe(&pdev->dev, error, "interrupt not available.\n");
> +               return dev_err_probe(dev, error, "interrupt not available.\n");
>
>         error = input_register_device(input);
>         if (error < 0)
> -               return dev_err_probe(&pdev->dev, error, "failed to register input device\n");
> +               return dev_err_probe(dev, error, "failed to register input device\n");
>
> -       device_init_wakeup(&pdev->dev, pdata->wakeup);
> -       error = dev_pm_set_wake_irq(&pdev->dev, pdata->irq);
> +       device_init_wakeup(dev, pdata->wakeup);
> +       error = dev_pm_set_wake_irq(dev, pdata->irq);
>         if (error)
> -               dev_err(&pdev->dev, "irq wake enable failed.\n");
> +               dev_err(dev, "irq wake enable failed.\n");
>
>         return 0;
>  }
>
> --
> 2.34.1
>
>