All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sebastian Reichel <sre@kernel.org>, Jiri Kosina <jikos@jikos.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Krzysztof Kozlowski <k.kozlowski@samsung.com>,
	Jason Gerecke <killertofu@gmail.com>
Subject: linux-next: manual merge of the battery tree with the hid tree
Date: Fri, 20 Mar 2015 15:11:10 +1100	[thread overview]
Message-ID: <20150320151110.02e10b33@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 4508 bytes --]

Hi Sebastian,

Today's linux-next merge of the battery tree got conflicts in
drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit
953f2c5f7163 ("HID: wacom: Centralize updating of wacom_wac battery
status") and fce9957d8f61 ("HID: wacom: Allow dynamic battery
creation/destruction") from the hid tree and commit 297d716f6260
("power_supply: Change ownership from driver to core") from the battery
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  I also applied the following merge fixup patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Mar 2015 14:59:36 +1100
Subject: [PATCH] HID: wacom: merge fix for "Change ownership from driver to core"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hid/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 5588ba80ede9..57ee0d807af1 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -62,7 +62,7 @@ static void wacom_notify_battery(struct wacom_wac *wacom_wac,
 		wacom_wac->ps_connected = ps_connected;
 
 		if (wacom->battery.dev)
-			power_supply_changed(&wacom->battery);
+			power_supply_changed(wacom->battery);
 	}
 }
 
-- 
2.1.4

and this:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Mar 2015 15:08:06 +1100
Subject: [PATCH] HID: wacom: merge fix 2 for "Change ownership from driver to core"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hid/wacom_sys.c | 4 ++--
 drivers/hid/wacom_wac.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 97940d7401d8..7dad9ea31490 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1343,11 +1343,11 @@ void wacom_battery_work(struct work_struct *work)
 	struct wacom *wacom = container_of(work, struct wacom, work);
 
 	if ((wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) &&
-	     !wacom->battery.dev) {
+	     !wacom->battery) {
 		wacom_initialize_battery(wacom);
 	}
 	else if (!(wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) &&
-		 wacom->battery.dev) {
+		 wacom->battery) {
 		wacom_destroy_battery(wacom);
 	}
 }
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 57ee0d807af1..1a3ce3767415 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -61,7 +61,7 @@ static void wacom_notify_battery(struct wacom_wac *wacom_wac,
 		wacom_wac->bat_connected = bat_connected;
 		wacom_wac->ps_connected = ps_connected;
 
-		if (wacom->battery.dev)
+		if (wacom->battery)
 			power_supply_changed(wacom->battery);
 	}
 }
@@ -2012,7 +2012,7 @@ static int wacom_status_irq(struct wacom_wac *wacom_wac, size_t len)
 		wacom_notify_battery(wacom_wac, battery, charging,
 				     battery || charging, 1);
 
-		if (!wacom->battery.dev &&
+		if (!wacom->battery &&
 		    !(features->quirks & WACOM_QUIRK_BATTERY)) {
 			features->quirks |= WACOM_QUIRK_BATTERY;
 			INIT_WORK(&wacom->work, wacom_battery_work);
@@ -2020,7 +2020,7 @@ static int wacom_status_irq(struct wacom_wac *wacom_wac, size_t len)
 		}
 	}
 	else if ((features->quirks & WACOM_QUIRK_BATTERY) &&
-		 wacom->battery.dev) {
+		 wacom->battery) {
 		features->quirks &= ~WACOM_QUIRK_BATTERY;
 		INIT_WORK(&wacom->work, wacom_battery_work);
 		wacom_schedule_work(wacom_wac);
-- 
2.1.4

There may be more required, of course.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/wacom.h
index ad7318db1dfe,0d0d0dd89d17..000000000000
--- a/drivers/hid/wacom.h
+++ b/drivers/hid/wacom.h
diff --cc drivers/hid/wacom_sys.c
index 353fe476be26,ba9af470bea0..000000000000
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@@ -1063,11 -1045,12 +1067,11 @@@ static int wacom_initialize_battery(str
  
  static void wacom_destroy_battery(struct wacom *wacom)
  {
- 	if (wacom->battery.dev) {
- 		power_supply_unregister(&wacom->battery);
- 		wacom->battery.dev = NULL;
- 		power_supply_unregister(&wacom->ac);
- 		wacom->ac.dev = NULL;
 -	if ((wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) &&
 -	     wacom->battery) {
++	if (wacom->battery) {
+ 		power_supply_unregister(wacom->battery);
+ 		wacom->battery = NULL;
+ 		power_supply_unregister(wacom->ac);
+ 		wacom->ac = NULL;
  	}
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-03-20  4:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-20  4:11 Stephen Rothwell [this message]
2015-03-20  7:58 ` linux-next: manual merge of the battery tree with the hid tree Krzysztof Kozlowski
2015-03-20  8:59   ` Krzysztof Kozlowski

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=20150320151110.02e10b33@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jikos@jikos.cz \
    --cc=k.kozlowski@samsung.com \
    --cc=killertofu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sre@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 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.