Skip to content

Commit

Permalink
gpio: generic: modernize remapping
Browse files Browse the repository at this point in the history
Replace devm_request_mem_region / devm_ioremap with devm_ioremap_resource.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Heiner Kallweit authored and Linus Walleij committed Oct 5, 2015
1 parent cf3f2a2 commit 43960b4
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/gpio/gpio-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
resource_size_t sane_sz,
int *err)
{
struct device *dev = &pdev->dev;
struct resource *r;
resource_size_t start;
resource_size_t sz;
void __iomem *ret;

Expand All @@ -602,15 +600,9 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
return NULL;
}

start = r->start;
if (!devm_request_mem_region(dev, start, sz, r->name)) {
*err = -EBUSY;
return NULL;
}

ret = devm_ioremap(dev, start, sz);
if (!ret) {
*err = -ENOMEM;
ret = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(ret)) {
*err = PTR_ERR(ret);
return NULL;
}

Expand Down

0 comments on commit 43960b4

Please sign in to comment.