Linux Input Archive on lore.kernel.org
 help / color / Atom feed
From: "Ondřej Jirman" <megous@megous.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-sunxi@googlegroups.com, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Luca Weiss <luca@z3ntu.xyz>, Tomas Novotny <tomas@novotny.cz>,
	linux-input@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 2/4] input: gpio-vibra: Allow to use vcc-supply alone to control the vibrator
Date: Thu, 30 Jul 2020 11:18:12 +0200
Message-ID: <20200730091812.7sia7w3waz2jj62a@core.my.home> (raw)
In-Reply-To: <20200730061939.GF1665100@dtor-ws>

Hello Dmitry,

thanks for looking into the patch. :)

On Wed, Jul 29, 2020 at 11:19:39PM -0700, Dmitry Torokhov wrote:
> Hi Ondrej,
> 
> On Tue, Jul 14, 2020 at 12:23:01PM +0200, Ondrej Jirman wrote:
> > Make enable-gpio optional to allow using this driver with boards that
> > have vibrator connected to a power supply without intermediate gpio
> > based enable circuitry.
> > 
> > Also avoid a case where neither regulator nor enable gpio is specified,
> > and bail out in probe in such a case.
> > 
> > Signed-off-by: Ondrej Jirman <megous@megous.com>
> > ---
> >  drivers/input/misc/gpio-vibra.c | 14 ++++++++++----
> >  1 file changed, 10 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/input/misc/gpio-vibra.c b/drivers/input/misc/gpio-vibra.c
> > index f79f75595dd7..b3bb7e61ed1d 100644
> > --- a/drivers/input/misc/gpio-vibra.c
> > +++ b/drivers/input/misc/gpio-vibra.c
> > @@ -39,7 +39,7 @@ static int gpio_vibrator_start(struct gpio_vibrator *vibrator)
> >  	struct device *pdev = vibrator->input->dev.parent;
> >  	int err;
> >  
> > -	if (!vibrator->vcc_on) {
> > +	if (vibrator->vcc && !vibrator->vcc_on) {
> >  		err = regulator_enable(vibrator->vcc);
> >  		if (err) {
> >  			dev_err(pdev, "failed to enable regulator: %d\n", err);
> > @@ -57,7 +57,7 @@ static void gpio_vibrator_stop(struct gpio_vibrator *vibrator)
> >  {
> >  	gpiod_set_value_cansleep(vibrator->gpio, 0);
> >  
> > -	if (vibrator->vcc_on) {
> > +	if (vibrator->vcc && vibrator->vcc_on) {
> >  		regulator_disable(vibrator->vcc);
> >  		vibrator->vcc_on = false;
> >  	}
> > @@ -112,7 +112,7 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
> >  	if (!vibrator->input)
> >  		return -ENOMEM;
> >  
> > -	vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc");
> > +	vibrator->vcc = devm_regulator_get_optional(&pdev->dev, "vcc");
> 
> I know it is very surprising, but regulator_get_optional does not return
> NULL when regulator is not present, but rather ERR_PTR(-ENODEV). You
> need to replace it with NULL in the branch below, or change conditions
> to !IS_ERR(virbrator->vcc) (and still handle -ENODEV in the branch
> below).

Oops, I'll fix that in the next revision.

regards,
	o.

> >  	err = PTR_ERR_OR_ZERO(vibrator->vcc);
> >  	if (err) {
> >  		if (err != -EPROBE_DEFER)
> > @@ -121,7 +121,8 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
> >  		return err;
> >  	}
> >  
> > -	vibrator->gpio = devm_gpiod_get(&pdev->dev, "enable", GPIOD_OUT_LOW);
> > +	vibrator->gpio = devm_gpiod_get_optional(&pdev->dev, "enable",
> > +						 GPIOD_OUT_LOW);
> >  	err = PTR_ERR_OR_ZERO(vibrator->gpio);
> >  	if (err) {
> >  		if (err != -EPROBE_DEFER)
> > @@ -130,6 +131,11 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
> >  		return err;
> >  	}
> >  
> > +	if (!vibrator->vcc && !vibrator->gpio) {
> > +		dev_err(&pdev->dev, "Neither gpio nor regulator provided\n");
> > +		return -EINVAL;
> > +	}
> > +
> >  	INIT_WORK(&vibrator->play_work, gpio_vibrator_play_work);
> >  
> >  	vibrator->input->name = "gpio-vibrator";
> > -- 
> > 2.27.0
> > 
> 
> Thanks.
> 
> -- 
> Dmitry

  reply index

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-14 10:22 [PATCH v4 0/4] Add support for vibrator motor for TBS A711 Tablet Ondrej Jirman
2020-07-14 10:23 ` [PATCH v4 1/4] dt-bindings: input: gpio-vibrator: Don't require enable-gpios Ondrej Jirman
2020-07-14 10:23 ` [PATCH v4 2/4] input: gpio-vibra: Allow to use vcc-supply alone to control the vibrator Ondrej Jirman
2020-07-30  6:19   ` Dmitry Torokhov
2020-07-30  9:18     ` Ondřej Jirman [this message]
2020-07-14 10:23 ` [PATCH v4 3/4] ARM: dts: sun8i-a83t-tbs-a711: Add support for the vibrator motor Ondrej Jirman
2020-07-14 10:23 ` [PATCH v4 4/4] ARM: dts: sun8i-a83t-tbs-a711: Increase voltage on the vibrator Ondrej Jirman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200730091812.7sia7w3waz2jj62a@core.my.home \
    --to=megous@megous.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=luca@z3ntu.xyz \
    --cc=mark.rutland@arm.com \
    --cc=mripard@kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=tomas@novotny.cz \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux Input Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-input/0 linux-input/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-input linux-input/ https://lore.kernel.org/linux-input \
		linux-input@vger.kernel.org
	public-inbox-index linux-input

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-input


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git