From: broonie@kernel•org
To: Chanwoo Choi <cw00.choi@samsung•com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo•fr>,
Dan Carpenter <dan.carpenter@oracle•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sebastian Reichel <sebastian.reichel@collabora•com>
Subject: linux-next: manual merge of the extcon tree with the battery tree
Date: Fri, 25 Feb 2022 20:46:58 +0000 [thread overview]
Message-ID: <20220225204658.4006482-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the extcon tree got a conflict in:
drivers/power/supply/max8997_charger.c
between commit:
fdc9ce72cffea ("power: supply: max8997_charger: Use devm_work_autocancel()")
from the battery tree and commit:
e77e52e00b184 ("extcon: Fix extcon_get_extcon_dev() error handling")
from the extcon tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/power/supply/max8997_charger.c
index 127c73b0b3bd7,634658adf313f..0000000000000
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@@ -242,15 -248,15 +242,15 @@@ static int max8997_battery_probe(struc
dev_info(&pdev->dev, "couldn't get charger regulator\n");
}
charger->edev = extcon_get_extcon_dev("max8997-muic");
- if (IS_ERR_OR_NULL(charger->edev)) {
- if (!charger->edev)
- return -EPROBE_DEFER;
- dev_info(charger->dev, "couldn't get extcon device\n");
+ if (IS_ERR(charger->edev)) {
+ dev_err_probe(charger->dev, PTR_ERR(charger->edev),
+ "couldn't get extcon device: max8997-muic\n");
+ return PTR_ERR(charger->edev);
}
- if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
+ if (!IS_ERR(charger->reg)) {
- INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
- ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
+ ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work,
+ max8997_battery_extcon_evt_worker);
if (ret) {
dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
return ret;
next reply other threads:[~2022-02-25 20:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 20:46 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-25 8:47 linux-next: manual merge of the extcon tree with the battery tree Stephen Rothwell
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=20220225204658.4006482-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=christophe.jaillet@wanadoo$(echo .)fr \
--cc=cw00.choi@samsung$(echo .)com \
--cc=dan.carpenter@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.reichel@collabora$(echo .)com \
/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