From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Josh Cartwright <joshc@codeaurora•org>
Subject: linux-next: manual merge of the gpio tree with the pinctrl tree
Date: Wed, 1 Oct 2014 16:01:46 +1000 [thread overview]
Message-ID: <20141001160146.3649b2f8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in
drivers/pinctrl/qcom/pinctrl-msm.c between commit cf1fc1876289
("pinctrl: qcom: use restart_notifier mechanism for ps_hold") from the
pinctrl tree and commit 2fcea6cecbc9 ("pinctrl: remove remaining users
of gpiochip_remove() retval") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/pinctrl/qcom/pinctrl-msm.c
index d30dddd21323,041677113a48..000000000000
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@@ -936,18 -903,9 +936,10 @@@ EXPORT_SYMBOL(msm_pinctrl_probe)
int msm_pinctrl_remove(struct platform_device *pdev)
{
struct msm_pinctrl *pctrl = platform_get_drvdata(pdev);
- int ret;
-
- ret = gpiochip_remove(&pctrl->chip);
- if (ret) {
- dev_err(&pdev->dev, "Failed to remove gpiochip\n");
- return ret;
- }
+ gpiochip_remove(&pctrl->chip);
pinctrl_unregister(pctrl->pctrl);
-
+ unregister_restart_handler(&pctrl->restart_nb);
-
return 0;
}
EXPORT_SYMBOL(msm_pinctrl_remove);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-10-01 6:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 6:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-16 3:37 linux-next: manual merge of the gpio tree with the pinctrl tree Stephen Rothwell
2016-02-16 8:23 ` Geert Uytterhoeven
2016-02-16 10:16 ` Stephen Rothwell
2016-09-13 3:15 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=20141001160146.3649b2f8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=joshc@codeaurora$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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