linux-next: manual merge of the pinctrl tree with thedriver-core.current tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit c2c57b329c7b ("Drivers:
pinctrl: remove __dev* attributes") from the driver-core.current tree and
commit f7ae849b80de ("pinctrl/nomadik: adopt pinctrl sleep mode
management") from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index c68ec40,8e4720f..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -1846,7 -2111,29 +2111,29 @@@ static const struct of_device_id nmk_pi
  	{},
  };
  
+ static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state)
+ {
+ 	struct nmk_pinctrl *npct;
+ 
+ 	npct = platform_get_drvdata(pdev);
+ 	if (!npct)
+ 		return -EINVAL;
+ 
+ 	return pinctrl_force_sleep(npct->pctl);
+ }
+ 
+ static int nmk_pinctrl_resume(struct platform_device *pdev)
+ {
+ 	struct nmk_pinctrl *npct;
+ 
+ 	npct = platform_get_drvdata(pdev);
+ 	if (!npct)
+ 		return -EINVAL;
+ 
+ 	return pinctrl_force_default(npct->pctl);
+ }
+ 
 -static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
 +static int nmk_pinctrl_probe(struct platform_device *pdev)
  {
  	const struct platform_device_id *platid = platform_get_device_id(pdev);
  	struct device_node *np = pdev->dev.of_node;

Attachment: pgp00000.pgp
Description: PGP signature