Subject: linux-next: manual merge of the gpio tree with the pinctrl tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 1 Oct 2014 16:01:46 +1000

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                    [email-masked]

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);