* [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper
@ 2022-09-20 15:36 Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 2/5] Input: gpio-vibra " Yang Yingliang
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-20 15:36 UTC (permalink / raw)
To: linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/input/misc/da7280.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
index b08610d6e575..b1ca4fd94e9e 100644
--- a/drivers/input/misc/da7280.c
+++ b/drivers/input/misc/da7280.c
@@ -1166,12 +1166,9 @@ static int da7280_probe(struct i2c_client *client,
if (haptics->const_op_mode == DA7280_PWM_MODE) {
haptics->pwm_dev = devm_pwm_get(dev, NULL);
error = PTR_ERR_OR_ZERO(haptics->pwm_dev);
- if (error) {
- if (error != -EPROBE_DEFER)
- dev_err(dev, "Unable to request PWM: %d\n",
- error);
- return error;
- }
+ if (error)
+ return dev_err_probe(dev, error,
+ "Unable to request PWM\n");
/* Sync up PWM state and ensure it is off. */
pwm_init_state(haptics->pwm_dev, &state);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -next 2/5] Input: gpio-vibra - Switch to use dev_err_probe() helper
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
@ 2022-09-20 15:36 ` Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 3/5] Input: pwm-beeper " Yang Yingliang
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-20 15:36 UTC (permalink / raw)
To: linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/input/misc/gpio-vibra.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/input/misc/gpio-vibra.c b/drivers/input/misc/gpio-vibra.c
index f79f75595dd7..94f5b450beae 100644
--- a/drivers/input/misc/gpio-vibra.c
+++ b/drivers/input/misc/gpio-vibra.c
@@ -114,21 +114,15 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc");
err = PTR_ERR_OR_ZERO(vibrator->vcc);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request regulator: %d\n",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err,
+ "Failed to request regulator\n");
vibrator->gpio = devm_gpiod_get(&pdev->dev, "enable", GPIOD_OUT_LOW);
err = PTR_ERR_OR_ZERO(vibrator->gpio);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request main gpio: %d\n",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err,
+ "Failed to request main gpio\n");
INIT_WORK(&vibrator->play_work, gpio_vibrator_play_work);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -next 3/5] Input: pwm-beeper - Switch to use dev_err_probe() helper
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 2/5] Input: gpio-vibra " Yang Yingliang
@ 2022-09-20 15:36 ` Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 4/5] Input: pwm-vibra " Yang Yingliang
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-20 15:36 UTC (permalink / raw)
To: linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/input/misc/pwm-beeper.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index d6b12477748a..c1d9310e9a06 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -132,13 +132,9 @@ static int pwm_beeper_probe(struct platform_device *pdev)
return -ENOMEM;
beeper->pwm = devm_pwm_get(dev, NULL);
- if (IS_ERR(beeper->pwm)) {
- error = PTR_ERR(beeper->pwm);
- if (error != -EPROBE_DEFER)
- dev_err(dev, "Failed to request PWM device: %d\n",
- error);
- return error;
- }
+ if (IS_ERR(beeper->pwm))
+ return dev_err_probe(dev, PTR_ERR(beeper->pwm),
+ "Failed to request PWM device\n");
/* Sync up PWM state and ensure it is off. */
pwm_init_state(beeper->pwm, &state);
@@ -151,13 +147,9 @@ static int pwm_beeper_probe(struct platform_device *pdev)
}
beeper->amplifier = devm_regulator_get(dev, "amp");
- if (IS_ERR(beeper->amplifier)) {
- error = PTR_ERR(beeper->amplifier);
- if (error != -EPROBE_DEFER)
- dev_err(dev, "Failed to get 'amp' regulator: %d\n",
- error);
- return error;
- }
+ if (IS_ERR(beeper->amplifier))
+ return dev_err_probe(dev, PTR_ERR(beeper->amplifier),
+ "Failed to get 'amp' regulator\n");
INIT_WORK(&beeper->work, pwm_beeper_work);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -next 4/5] Input: pwm-vibra - Switch to use dev_err_probe() helper
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 2/5] Input: gpio-vibra " Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 3/5] Input: pwm-beeper " Yang Yingliang
@ 2022-09-20 15:36 ` Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 5/5] Input: rotary_encoder " Yang Yingliang
2022-09-22 8:51 ` [PATCH -next 1/5] Input: da7280 " Mattijs Korpershoek
4 siblings, 0 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-20 15:36 UTC (permalink / raw)
To: linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/input/misc/pwm-vibra.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
index 81e777a04b88..fe6074e6fe68 100644
--- a/drivers/input/misc/pwm-vibra.c
+++ b/drivers/input/misc/pwm-vibra.c
@@ -135,21 +135,15 @@ static int pwm_vibrator_probe(struct platform_device *pdev)
vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc");
err = PTR_ERR_OR_ZERO(vibrator->vcc);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request regulator: %d",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err,
+ "Failed to request regulator\n");
vibrator->pwm = devm_pwm_get(&pdev->dev, "enable");
err = PTR_ERR_OR_ZERO(vibrator->pwm);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request main pwm: %d",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err,
+ "Failed to request main pwm\n");
INIT_WORK(&vibrator->play_work, pwm_vibrator_play_work);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -next 5/5] Input: rotary_encoder - Switch to use dev_err_probe() helper
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
` (2 preceding siblings ...)
2022-09-20 15:36 ` [PATCH -next 4/5] Input: pwm-vibra " Yang Yingliang
@ 2022-09-20 15:36 ` Yang Yingliang
2022-09-22 8:51 ` [PATCH -next 1/5] Input: da7280 " Mattijs Korpershoek
4 siblings, 0 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-20 15:36 UTC (permalink / raw)
To: linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/input/misc/rotary_encoder.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 6d613f2a017c..e106cab58e8f 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -236,12 +236,9 @@ static int rotary_encoder_probe(struct platform_device *pdev)
device_property_read_bool(dev, "rotary-encoder,relative-axis");
encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN);
- if (IS_ERR(encoder->gpios)) {
- err = PTR_ERR(encoder->gpios);
- if (err != -EPROBE_DEFER)
- dev_err(dev, "unable to get gpios: %d\n", err);
- return err;
- }
+ if (IS_ERR(encoder->gpios))
+ return dev_err_probe(dev, PTR_ERR(encoder->gpios),
+ "unable to get gpios\n");
if (encoder->gpios->ndescs < 2) {
dev_err(dev, "not enough gpios found\n");
return -EINVAL;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
` (3 preceding siblings ...)
2022-09-20 15:36 ` [PATCH -next 5/5] Input: rotary_encoder " Yang Yingliang
@ 2022-09-22 8:51 ` Mattijs Korpershoek
2022-09-22 10:23 ` Yang Yingliang
4 siblings, 1 reply; 7+ messages in thread
From: Mattijs Korpershoek @ 2022-09-22 8:51 UTC (permalink / raw)
To: Yang Yingliang, linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig, yangyingliang
Hi Yang,
Thank you for your series,
On Tue, Sep 20, 2022 at 23:36, Yang Yingliang <yangyingliang@huawei.com> wrote:
> In the probe path, dev_err() can be replaced with dev_err_probe()
> which will check if error code is -EPROBE_DEFER and prints the
> error name. It also sets the defer probe reason which can be
> checked later through debugfs.
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> drivers/input/misc/da7280.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
> index b08610d6e575..b1ca4fd94e9e 100644
> --- a/drivers/input/misc/da7280.c
> +++ b/drivers/input/misc/da7280.c
> @@ -1166,12 +1166,9 @@ static int da7280_probe(struct i2c_client *client,
> if (haptics->const_op_mode == DA7280_PWM_MODE) {
> haptics->pwm_dev = devm_pwm_get(dev, NULL);
> error = PTR_ERR_OR_ZERO(haptics->pwm_dev);
> - if (error) {
> - if (error != -EPROBE_DEFER)
> - dev_err(dev, "Unable to request PWM: %d\n",
> - error);
> - return error;
> - }
> + if (error)
> + return dev_err_probe(dev, error,
> + "Unable to request PWM\n");
For the whole series:
If we look at the input tree, we can see that there is no occurence of
dev_err_probe():
$ ~/src/linux/drivers/input/ 483fed3b5dc8 grep -rsn dev_err_probe
$ ~/src/linux/drivers/input/ 483fed3b5dc8
The reason for this is that the input maintainer (Dmitry) dislikes
dev_err_probe() as he stated in [1]
So I don't think he will apply this.
Regards,
Mattijs
[1] https://lore.kernel.org/r/YWTpg35wyYS1uoFZ@google.com
>
> /* Sync up PWM state and ensure it is off. */
> pwm_init_state(haptics->pwm_dev, &state);
> --
> 2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper
2022-09-22 8:51 ` [PATCH -next 1/5] Input: da7280 " Mattijs Korpershoek
@ 2022-09-22 10:23 ` Yang Yingliang
0 siblings, 0 replies; 7+ messages in thread
From: Yang Yingliang @ 2022-09-22 10:23 UTC (permalink / raw)
To: Mattijs Korpershoek, linux-input
Cc: dmitry.torokhov, thierry.reding, u.kleine-koenig
Hi Mattijs,
On 2022/9/22 16:51, Mattijs Korpershoek wrote:
> Hi Yang,
>
> Thank you for your series,
>
> On Tue, Sep 20, 2022 at 23:36, Yang Yingliang <yangyingliang@huawei.com> wrote:
>
>> In the probe path, dev_err() can be replaced with dev_err_probe()
>> which will check if error code is -EPROBE_DEFER and prints the
>> error name. It also sets the defer probe reason which can be
>> checked later through debugfs.
>>
>> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
>> ---
>> drivers/input/misc/da7280.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
>> index b08610d6e575..b1ca4fd94e9e 100644
>> --- a/drivers/input/misc/da7280.c
>> +++ b/drivers/input/misc/da7280.c
>> @@ -1166,12 +1166,9 @@ static int da7280_probe(struct i2c_client *client,
>> if (haptics->const_op_mode == DA7280_PWM_MODE) {
>> haptics->pwm_dev = devm_pwm_get(dev, NULL);
>> error = PTR_ERR_OR_ZERO(haptics->pwm_dev);
>> - if (error) {
>> - if (error != -EPROBE_DEFER)
>> - dev_err(dev, "Unable to request PWM: %d\n",
>> - error);
>> - return error;
>> - }
>> + if (error)
>> + return dev_err_probe(dev, error,
>> + "Unable to request PWM\n");
> For the whole series:
>
> If we look at the input tree, we can see that there is no occurence of
> dev_err_probe():
>
> $ ~/src/linux/drivers/input/ 483fed3b5dc8 grep -rsn dev_err_probe
> $ ~/src/linux/drivers/input/ 483fed3b5dc8
>
> The reason for this is that the input maintainer (Dmitry) dislikes
> dev_err_probe() as he stated in [1]
>
> So I don't think he will apply this.
OK, thanks for replying and mentioning it.
>
> Regards,
> Mattijs
>
> [1] https://lore.kernel.org/r/YWTpg35wyYS1uoFZ@google.com
>
>> /* Sync up PWM state and ensure it is off. */
>> pwm_init_state(haptics->pwm_dev, &state);
>> --
>> 2.25.1
> .
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-09-22 10:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20 15:36 [PATCH -next 1/5] Input: da7280 - Switch to use dev_err_probe() helper Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 2/5] Input: gpio-vibra " Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 3/5] Input: pwm-beeper " Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 4/5] Input: pwm-vibra " Yang Yingliang
2022-09-20 15:36 ` [PATCH -next 5/5] Input: rotary_encoder " Yang Yingliang
2022-09-22 8:51 ` [PATCH -next 1/5] Input: da7280 " Mattijs Korpershoek
2022-09-22 10:23 ` Yang Yingliang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.