mirror of
https://github.com/torvalds/linux.git
synced 2026-09-25 09:41:03 +02:00
Input: snvs_pwrkey - use local device pointer to simple code
Use local struct device pointer to avoid reference the platform_device pointer every time. No functional change. Reviewed-by: Frank Li <Frank.Li@nxp.com> Signed-off-by: Joy Zou <joy.zou@nxp.com> Link: https://patch.msgid.link/20260715-b4-pwrkey-v5-3-07e7353c319e@oss.nxp.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
7ef54727f5
commit
5a040cd37f
|
|
@ -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)
|
||||
return dev_err_probe(&pdev->dev, -ENOMEM, "failed to allocate the input device\n");
|
||||
return dev_err_probe(dev, -ENOMEM, "failed to allocate the input device\n");
|
||||
|
||||
input->name = pdev->name;
|
||||
input->phys = "snvs-pwrkey/input0";
|
||||
|
|
@ -191,27 +192,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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user