public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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,
	Thierry Reding <thierry.reding@avionic-design•de>,
	Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the pinctrl tree with the driver-core tree
Date: Wed, 23 Jan 2013 15:58:52 +1100	[thread overview]
Message-ID: <20130123155852.e8b35c4e85b0c65c4635b422@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1750 bytes --]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit 9e0c1fb29a7c ("pinctrl:
Convert to devm_ioremap_resource()") from the driver-core tree and commit
50f690d85e4e ("pinctrl/nomadik: simplify GPIO probe") 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@canb•auug.org.au

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 96e7cfb,b885c09..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -1350,34 -1351,24 +1351,24 @@@ static int nmk_gpio_probe(struct platfo
  	}
  
  	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
- 	if (!res) {
- 		ret = -ENOENT;
- 		goto out;
- 	}
+ 	if (!res)
+ 		return -ENOENT;
  
  	irq = platform_get_irq(dev, 0);
- 	if (irq < 0) {
- 		ret = irq;
- 		goto out;
- 	}
+ 	if (irq < 0)
+ 		return irq;
  
  	secondary_irq = platform_get_irq(dev, 1);
- 	if (secondary_irq >= 0 && !pdata->get_secondary_status) {
- 		ret = -EINVAL;
- 		goto out;
- 	}
+ 	if (secondary_irq >= 0 && !pdata->get_secondary_status)
+ 		return -EINVAL;
  
 -	base = devm_request_and_ioremap(&dev->dev, res);
 -	if (!base)
 -		return -ENOMEM;
 +	base = devm_ioremap_resource(&dev->dev, res);
- 	if (IS_ERR(base)) {
- 		ret = PTR_ERR(base);
- 		goto out;
- 	}
++	if (IS_ERR(base))
++		return PTR_ERR(base);
  
  	clk = devm_clk_get(&dev->dev, NULL);
- 	if (IS_ERR(clk)) {
- 		ret = PTR_ERR(clk);
- 		goto out;
- 	}
+ 	if (IS_ERR(clk))
+ 		return PTR_ERR(clk);
  	clk_prepare(clk);
  
  	nmk_chip = devm_kzalloc(&dev->dev, sizeof(*nmk_chip), GFP_KERNEL);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

next             reply	other threads:[~2013-01-23  4:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-23  4:58 Stephen Rothwell [this message]
2013-01-23  5:03 ` linux-next: manual merge of the pinctrl tree with the driver-core tree Greg KH
2013-01-23  8:28 ` Linus Walleij
  -- strict thread matches above, loose matches on Subject: below --
2014-11-10  6:29 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=20130123155852.e8b35c4e85b0c65c4635b422@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=greg@kroah$(echo .)com \
    --cc=linus.walleij@linaro$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=thierry.reding@avionic-design$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox