From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Jiri Kosina <jikos@kernel.org>, Ping Cheng <pinglinux@gmail.com>,
Jason Gerecke <killertofu@gmail.com>,
Aaron Skomra <skomra@gmail.com>,
Peter Hutterer <peter.hutterer@who-t.net>
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Subject: [PATCH v2 01/30] HID: wacom: actually report the battery level for wireless connected
Date: Wed, 13 Jul 2016 18:05:48 +0200 [thread overview]
Message-ID: <1468425977-4819-2-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1468425977-4819-1-git-send-email-benjamin.tissoires@redhat.com>
Since fd5f92b ("HID: wacom: reuse wacom_parse_and_register() in
wireless_work"), wacom->shared->type is not set.
Send the information of the battery if we have one.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
No changes in v2
---
drivers/hid/wacom_wac.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 1eae13c..d6746ca 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2125,6 +2125,7 @@ static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t len)
static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
{
+ struct wacom *w = container_of(wacom, struct wacom, wacom_wac);
unsigned char *data = wacom->data;
int connected;
@@ -2152,7 +2153,7 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
wacom_schedule_work(wacom);
}
- if (wacom->shared->type)
+ if (w->battery)
wacom_notify_battery(wacom, battery, charging, 1, 0);
} else if (wacom->pid != 0) {
--
2.5.5
next prev parent reply other threads:[~2016-07-13 16:06 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 16:05 [PATCH v2 00/30] HID: wacom: cleanup/EKR/LED Benjamin Tissoires
2016-07-13 16:05 ` Benjamin Tissoires [this message]
2016-07-13 16:05 ` [PATCH v2 02/30] HID: wacom: store the type in wacom->shared for INTUOSHT and INTUOSHT2 Benjamin Tissoires
2016-07-15 4:14 ` Ping Cheng
2016-07-18 14:54 ` Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 03/30] HID: wacom: remove cleanup of wacom->remote_dir from wacom_clean_inputs() Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 04/30] HID: wacom: untie leds from inputs Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 05/30] HID: wacom: use one work queue per task Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 06/30] HID: wacom: switch battery to devres Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 07/30] HID: wacom: switch inputs " Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 08/30] HID: wacom: put the managed resources in a group Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 09/30] HID: wacom: convert LEDs to devres Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 10/30] HID: wacom: use devm_kasprintf for allocating the name of the remote Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 11/30] HID: wacom: use devres to allocate driver data Benjamin Tissoires
2016-07-13 16:05 ` [PATCH v2 12/30] HID: wacom: devres manage the shared data too Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 13/30] HID: wacom: leds: dynamically allocate LED groups Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 14/30] HID: wacom: EKR: add a worker to add/remove resources on addition/removal Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 15/30] HID: wacom: EKR: have the wacom resources dynamically allocated Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 16/30] HID: wacom: rework fail path in probe() and parse_and_register() Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 17/30] HID: wacom: EKR: have proper allocator and destructor Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 18/30] HID: wacom: EKR: use devres groups to manage resources Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 19/30] HID: wacom: EKR: have one array of struct remotes instead of many arrays Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 20/30] HID: wacom: EKR: allocate one input node per remote Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 21/30] HID: wacom: EKR: have one power_supply " Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 22/30] HID: wacom: EKR: attach the power_supply on first connection Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 23/30] HID: wacom: leds: use the ledclass instead of custom made sysfs files Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 24/30] HID: wacom: leds: actually release the LEDs on disconnect Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 25/30] HID: wacom: leds: handle the switch of the LEDs directly in the kernel Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 26/30] HID: wacom: leds: make sure Cintiq 21UX2 and 24HD control the right LEDs Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 27/30] HID: wacom: leds: handle Cintiq 24HD leds buttons Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 28/30] HID: wacom: power_supply: mark the type as USB Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 29/30] HID: wacom: power_supply: remove ac information Benjamin Tissoires
2016-07-13 16:06 ` [PATCH v2 30/30] HID: wacom: power_supply: provide the actual model_name Benjamin Tissoires
2016-07-13 21:36 ` [PATCH v2 00/30] HID: wacom: cleanup/EKR/LED Aaron Armstrong Skomra
2016-08-01 23:17 ` Ping Cheng
2016-08-02 8:48 ` Jiri Kosina
2016-08-05 11:41 ` Jiri Kosina
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=1468425977-4819-2-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=killertofu@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
--cc=pinglinux@gmail.com \
--cc=skomra@gmail.com \
/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).