linux-kernel - linux-next: manual merge of the pinctrl tree with the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130123155852.e8b35c4e85b0c65c4635b422@canb.auug.org.au>
Date:	Wed, 23 Jan 2013 15:58:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...onic-design.de>,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the pinctrl tree with the driver-core
 tree

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@...b.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);

Content of type "application/pgp-signature" skipped