From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Jason Gerecke <killertofu@gmail.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] HID: input: map digitizer battery usage
Date: Tue, 1 Aug 2017 09:53:20 -0700 [thread overview]
Message-ID: <20170801165320.GA28401@dtor-ws> (raw)
In-Reply-To: <alpine.LSU.2.20.1708011631210.30597@cbobk.fhfr.pm>
On Tue, Aug 01, 2017 at 04:35:33PM +0200, Jiri Kosina wrote:
> On Mon, 31 Jul 2017, Dmitry Torokhov wrote:
>
> > We already mapped battery strength reports from the generic device
> > control page, but we did not update capacity from input reports, nor we
> > mapped the battery strength report from the digitizer page, so let's
> > implement this now.
> >
> > Batteries driven by the input reports will now start in "unknown" state,
> > and will get updated once we receive first report containing battery
> > strength from the device.
> >
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> > drivers/hid/hid-input.c | 181 ++++++++++++++++++++++++++++++++----------------
> > include/linux/hid.h | 2 +
> > 2 files changed, 124 insertions(+), 59 deletions(-)
> >
> > diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
> > index ccdff1ee1f0c..5bcd4e4afb54 100644
> > --- a/drivers/hid/hid-input.c
> > +++ b/drivers/hid/hid-input.c
> > @@ -340,13 +340,42 @@ static unsigned find_battery_quirk(struct hid_device *hdev)
> > return quirks;
> > }
> >
> > +static int hidinput_scale_battery_capacity(struct hid_device *dev,
> > + int value)
> > +{
> > + if (dev->battery_min < dev->battery_max &&
> > + value >= dev->battery_min && value <= dev->battery_max)
> > + value = ((value - dev->battery_min) * 100) /
> > + (dev->battery_max - dev->battery_min);
> > +
> > + return value;
> > +}
> > +
> > +static int hidinput_query_battery_capacity(struct hid_device *dev)
> > +{
> > + u8 *buf;
> > + int ret;
> > +
> > + buf = kmalloc(2, GFP_KERNEL);
> > + if (!buf)
> > + return -ENOMEM;
> > +
> > + ret = hid_hw_raw_request(dev, dev->battery_report_id, buf, 2,
> > + dev->battery_report_type, HID_REQ_GET_REPORT);
> > + ret = (ret != 2) ? -ENODATA : buf[1];
> > +
> > + kfree(buf);
> > +
> > + return hidinput_scale_battery_capacity(dev, ret);
>
> Is it intentional that you call hidinput_scale_battery_capacity() here
> even in 'ret == -ENODATA' case?
>
> It wouldn't actually break anything currently, as the
>
> value >= dev->battery_min
>
> check in hidinput_scale_battery_capacity() would most likely ensure that
> the value wouldn't get overwritten and then propagated back, but it's
> confusing and error-prone wrt. any future changes.
> Or have I missed something?
No, you are totally right, I'll resent the series in a few.
Thanks.
--
Dmitry
prev parent reply other threads:[~2017-08-01 16:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-31 23:21 [PATCH 1/2] HID: input: map digitizer battery usage Dmitry Torokhov
2017-07-31 23:21 ` [PATCH 2/2] HID: input: optionally use device id in battery name Dmitry Torokhov
2017-08-01 14:35 ` [PATCH 1/2] HID: input: map digitizer battery usage Jiri Kosina
2017-08-01 16:53 ` Dmitry Torokhov [this message]
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=20170801165320.GA28401@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=killertofu@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).