From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sebastian Reichel <sre@kernel•org>, Lee Jones <lee@kernel•org>
Cc: Jakob Hauser <jahau@rocketmail•com>,
Rob Herring <robh@kernel•org>,
Sebastian Reichel <sebastian.reichel@collabora•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the battery tree
Date: Mon, 21 Aug 2023 12:57:41 +1000 [thread overview]
Message-ID: <20230821125741.3a2474d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2520 bytes --]
Hi all,
After merging the battery tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/power/supply/rt5033_charger.c: In function 'rt5033_charger_probe':
drivers/power/supply/rt5033_charger.c:694:19: error: implicit declaration of function 'of_parse_phandle' [-Werror=implicit-function-declaration]
694 | np_conn = of_parse_phandle(pdev->dev.of_node, "richtek,usb-connector", 0);
| ^~~~~~~~~~~~~~~~
drivers/power/supply/rt5033_charger.c:694:17: error: assignment to 'struct device_node *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
694 | np_conn = of_parse_phandle(pdev->dev.of_node, "richtek,usb-connector", 0);
| ^
drivers/power/supply/rt5033_charger.c:695:19: error: implicit declaration of function 'of_get_parent'; did you mean 'kernfs_get_parent'? [-Werror=implicit-function-declaration]
695 | np_edev = of_get_parent(np_conn);
| ^~~~~~~~~~~~~
| kernfs_get_parent
drivers/power/supply/rt5033_charger.c:695:17: error: assignment to 'struct device_node *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
695 | np_edev = of_get_parent(np_conn);
| ^
Caused by commit
2ce8284c3115 ("power: Explicitly include correct DT includes")
interacting with commit
12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB OTG supply")
from the mfd tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 21 Aug 2023 12:50:12 +1000
Subject: [PATCH] fixup for "power: Explicitly include correct DT includes"
interacting with commit
12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB OTG supply")
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/power/supply/rt5033_charger.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/rt5033_charger.c
index 4d1198d752b7..4ea769775fa5 100644
--- a/drivers/power/supply/rt5033_charger.c
+++ b/drivers/power/supply/rt5033_charger.c
@@ -11,6 +11,7 @@
#include <linux/extcon.h>
#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
#include <linux/regmap.h>
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-21 2:57 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-21 2:57 Stephen Rothwell [this message]
2023-08-21 7:07 ` linux-next: build failure after merge of the battery tree Lee Jones
2023-08-21 7:13 ` Lee Jones
2023-08-21 12:41 ` Rob Herring
2023-08-21 12:46 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2026-03-03 13:54 Mark Brown
2026-03-03 23:02 ` Sebastian Reichel
2022-06-20 0:45 Stephen Rothwell
2022-06-21 12:30 ` Asmaa Mnebhi
2022-06-24 2:47 ` Stephen Rothwell
2022-06-24 12:44 ` Asmaa Mnebhi
2022-06-28 2:30 ` Stephen Rothwell
2022-05-04 2:35 Stephen Rothwell
2019-12-19 0:01 Stephen Rothwell
2019-12-19 1:35 ` Sebastian Reichel
2019-06-28 4:03 Stephen Rothwell
2019-06-28 15:31 ` Sebastian Reichel
2019-06-28 16:56 ` Enric Balletbo i Serra
2019-06-29 0:33 ` Stephen Rothwell
2019-07-01 13:22 ` Enric Balletbo i Serra
2015-09-29 1:45 Stephen Rothwell
2015-10-02 1:49 ` Stephen Rothwell
2015-10-08 1:04 ` Stephen Rothwell
2015-10-08 6:12 ` Belisko Marek
2015-10-08 10:21 ` Stephen Rothwell
2015-10-15 14:26 ` Stephen Rothwell
2015-10-20 22:32 ` Stephen Rothwell
2015-10-21 6:12 ` Belisko Marek
2015-07-27 1:40 Stephen Rothwell
2012-07-16 4:09 Stephen Rothwell
2012-07-16 4:57 ` Chanwoo Choi
2012-03-15 2:56 Stephen Rothwell
2012-03-20 4:39 ` Stephen Rothwell
2012-03-26 2:13 ` Stephen Rothwell
2012-03-26 16:11 ` Anton Vorontsov
2012-03-26 21:44 ` Stephen Rothwell
2012-03-26 21:47 ` Stephen Rothwell
2012-03-27 13:03 ` Anton Vorontsov
2012-03-28 11:38 ` Mark Brown
[not found] <C3AE124F08223B42BC95AEB82F0F6CED1FDB2C78@KCHJEXMB02.kpit.com>
2012-01-09 8:29 ` Ashish Jangam
2012-01-09 13:10 ` linux-next: " Anton Vorontsov
2012-01-09 23:53 ` Mark Brown
2012-01-10 0:51 ` Anton Vorontsov
2012-01-09 2:11 Stephen Rothwell
2012-01-05 3:40 Stephen Rothwell
2012-01-05 15:25 ` Anton Vorontsov
2012-01-05 15:53 ` Greg KH
2012-01-07 9:00 ` Jeremy Fitzhardinge
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=20230821125741.3a2474d7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jahau@rocketmail$(echo .)com \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=sebastian.reichel@collabora$(echo .)com \
--cc=sre@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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