[PATCH RESEND] fixup! gpio: generic: sync with upstream Linux gpio-mmio driver

[Ahmad Fatoum]

Commit inadvertently brcm,bcm6345-gpio, wd,mbl-gpio, and ni,169445-nand-gpio,
because "dat" was now requested twice. Fix this up.

Tested on Erizo.

Reported-by: Antony Pavlov <antonynpavlov at gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
This was part of a series that needed some rework. The fix is relevant
regardless, so sending it out independently.
---
 drivers/gpio/gpio-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 713085267a15..3066b3f7a19d 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -537,7 +537,7 @@ static int bgpio_dev_probe(struct device_d *dev)
 	if (IS_ERR(pdata))
 		return PTR_ERR(pdata);
 
-	r = dev_request_mem_resource_by_name(dev, "dat");
+	r = dev_get_resource_by_name(dev, IORESOURCE_MEM, "dat");
 	if (!r)
 		return -EINVAL;
 
-- 
2.29.2