linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
Don't free chip label memory") from Linus' tree and commit 641d03422a59
("gpio: Convert to devm_ioremap_resource()") from the driver-core tree.

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

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/gpio/gpio-mvebu.c
index 6819d63,bf6c7c9..0000000
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@@ -544,10 -545,10 +545,9 @@@ static int mvebu_gpio_probe(struct plat
        mvchip->chip.of_node = np;
  
        spin_lock_init(&mvchip->lock);
-       mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
-       if (! mvchip->membase) {
-               dev_err(&pdev->dev, "Cannot ioremap\n");
-               return -ENOMEM;
+       mvchip->membase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mvchip->membase)) {
 -              kfree(mvchip->chip.label);
+               return PTR_ERR(mvchip->membase);
        }
  
        /* The Armada XP has a second range of registers for the
@@@ -559,10 -560,12 +559,10 @@@
                        return -ENODEV;
                }
  
-               mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, 
res);
-               if (! mvchip->percpu_membase) {
-                       dev_err(&pdev->dev, "Cannot ioremap\n");
-                       return -ENOMEM;
+               mvchip->percpu_membase = devm_ioremap_resource(&pdev->dev,
+                                                              res);
+               if (IS_ERR(mvchip->percpu_membase)) {
 -                      kfree(mvchip->chip.label);
+                       return PTR_ERR(mvchip->percpu_membase);
                }
        }
  

pgp59ikPr5I8j.pgp
Description: PGP signature