| Message ID | 20231213214803.9931-3-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | bd2334eda183a2888b5541605b39617c1e6b4b71 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Add polling support for DA9063 onkey driver | expand |
On Wed, Dec 13, 2023 at 09:48:01PM +0000, Biju Das wrote: > The memory allocation core code already prints error message in case of > OOM. So, drop additional print messages for OOM cases. > > While at it, input_register_device() is already printing error messages on > failure. Drop the redundant print. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > v2: > * New patch. > --- > drivers/input/misc/da9063_onkey.c | 23 ++++------------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c > index 9351ce0bb405..80878274204e 100644 > --- a/drivers/input/misc/da9063_onkey.c > +++ b/drivers/input/misc/da9063_onkey.c > @@ -185,10 +185,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) > > onkey = devm_kzalloc(&pdev->dev, sizeof(struct da9063_onkey), > GFP_KERNEL); > - if (!onkey) { > - dev_err(&pdev->dev, "Failed to allocate memory.\n"); > + if (!onkey) > return -ENOMEM; > - } > > onkey->config = device_get_match_data(&pdev->dev); > if (!onkey->config) > @@ -206,10 +204,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) > "dlg,disable-key-power"); > > onkey->input = devm_input_allocate_device(&pdev->dev); > - if (!onkey->input) { > - dev_err(&pdev->dev, "Failed to allocated input device.\n"); > + if (!onkey->input) > return -ENOMEM; > - } > > onkey->input->name = onkey->config->name; > snprintf(onkey->phys, sizeof(onkey->phys), "%s/input0", > @@ -221,12 +217,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) > > error = devm_delayed_work_autocancel(&pdev->dev, &onkey->work, > da9063_poll_on); > - if (error) { > - dev_err(&pdev->dev, > - "Failed to add cancel poll action: %d\n", > - error); > + if (error) > return error; > - } > > irq = platform_get_irq_byname(pdev, "ONKEY"); > if (irq < 0) > @@ -250,14 +242,7 @@ static int da9063_onkey_probe(struct platform_device *pdev) > else > device_init_wakeup(&pdev->dev, true); > > - error = input_register_device(onkey->input); > - if (error) { > - dev_err(&pdev->dev, > - "Failed to register input device: %d\n", error); > - return error; > - } > - > - return 0; > + return input_register_device(onkey->input); When there are multiple exit points I prefer all of them to use form error = action(...); if (error) return error; ... return 0; Fixed up and applied, thank you. Thanks.
diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c index 9351ce0bb405..80878274204e 100644 --- a/drivers/input/misc/da9063_onkey.c +++ b/drivers/input/misc/da9063_onkey.c @@ -185,10 +185,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) onkey = devm_kzalloc(&pdev->dev, sizeof(struct da9063_onkey), GFP_KERNEL); - if (!onkey) { - dev_err(&pdev->dev, "Failed to allocate memory.\n"); + if (!onkey) return -ENOMEM; - } onkey->config = device_get_match_data(&pdev->dev); if (!onkey->config) @@ -206,10 +204,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) "dlg,disable-key-power"); onkey->input = devm_input_allocate_device(&pdev->dev); - if (!onkey->input) { - dev_err(&pdev->dev, "Failed to allocated input device.\n"); + if (!onkey->input) return -ENOMEM; - } onkey->input->name = onkey->config->name; snprintf(onkey->phys, sizeof(onkey->phys), "%s/input0", @@ -221,12 +217,8 @@ static int da9063_onkey_probe(struct platform_device *pdev) error = devm_delayed_work_autocancel(&pdev->dev, &onkey->work, da9063_poll_on); - if (error) { - dev_err(&pdev->dev, - "Failed to add cancel poll action: %d\n", - error); + if (error) return error; - } irq = platform_get_irq_byname(pdev, "ONKEY"); if (irq < 0) @@ -250,14 +242,7 @@ static int da9063_onkey_probe(struct platform_device *pdev) else device_init_wakeup(&pdev->dev, true); - error = input_register_device(onkey->input); - if (error) { - dev_err(&pdev->dev, - "Failed to register input device: %d\n", error); - return error; - } - - return 0; + return input_register_device(onkey->input); } static const struct of_device_id da9063_compatible_reg_id_table[] = {
The memory allocation core code already prints error message in case of OOM. So, drop additional print messages for OOM cases. While at it, input_register_device() is already printing error messages on failure. Drop the redundant print. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- v2: * New patch. --- drivers/input/misc/da9063_onkey.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)