From cf3f2a2c8bae0db72233629c9da9d9f617b3f8af Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Wed, 30 Sep 2015 23:50:20 +0200 Subject: gpio: generic: improve error handling in bgpio_map If bgpio_map returns NULL then err should always be set. Signed-off-by: Heiner Kallweit Signed-off-by: Linus Walleij --- drivers/gpio/gpio-generic.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/gpio/gpio-generic.c') diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index a3f07537fe62..eefff1a29986 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -591,8 +591,10 @@ static void __iomem *bgpio_map(struct platform_device *pdev, *err = 0; r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); - if (!r) + if (!r) { + *err = -EINVAL; return NULL; + } sz = resource_size(r); if (sz != sane_sz) { @@ -637,8 +639,8 @@ static int bgpio_pdev_probe(struct platform_device *pdev) sz = resource_size(r); dat = bgpio_map(pdev, "dat", sz, &err); - if (!dat) - return err ? err : -EINVAL; + if (err) + return err; set = bgpio_map(pdev, "set", sz, &err); if (err) -- cgit v1.2.3 From 43960b4731d3450fe82105c40ee19d487622e427 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Wed, 30 Sep 2015 23:51:08 +0200 Subject: gpio: generic: modernize remapping Replace devm_request_mem_region / devm_ioremap with devm_ioremap_resource. Signed-off-by: Heiner Kallweit Signed-off-by: Linus Walleij --- drivers/gpio/gpio-generic.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'drivers/gpio/gpio-generic.c') diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index eefff1a29986..0cdbe104e567 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -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; @@ -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; } -- cgit v1.2.3 From 8d2402605b85be860808961cd82fdc4bd8bc1704 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Wed, 30 Sep 2015 23:52:36 +0200 Subject: gpio: generic: use error pointers Use the ERRPTR standard way to return an error code in a pointer thus simplifiying the code. Signed-off-by: Heiner Kallweit Signed-off-by: Linus Walleij --- drivers/gpio/gpio-generic.c | 56 +++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) (limited to 'drivers/gpio/gpio-generic.c') diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index 0cdbe104e567..d8b1700b9519 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -579,34 +579,20 @@ EXPORT_SYMBOL_GPL(bgpio_init); static void __iomem *bgpio_map(struct platform_device *pdev, const char *name, - resource_size_t sane_sz, - int *err) + resource_size_t sane_sz) { struct resource *r; resource_size_t sz; - void __iomem *ret; - - *err = 0; r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); - if (!r) { - *err = -EINVAL; - return NULL; - } + if (!r) + return IOMEM_ERR_PTR(-EINVAL); sz = resource_size(r); - if (sz != sane_sz) { - *err = -EINVAL; - return NULL; - } + if (sz != sane_sz) + return IOMEM_ERR_PTR(-EINVAL); - ret = devm_ioremap_resource(&pdev->dev, r); - if (IS_ERR(ret)) { - *err = PTR_ERR(ret); - return NULL; - } - - return ret; + return devm_ioremap_resource(&pdev->dev, r); } static int bgpio_pdev_probe(struct platform_device *pdev) @@ -630,25 +616,25 @@ static int bgpio_pdev_probe(struct platform_device *pdev) sz = resource_size(r); - dat = bgpio_map(pdev, "dat", sz, &err); - if (err) - return err; + dat = bgpio_map(pdev, "dat", sz); + if (IS_ERR(dat)) + return PTR_ERR(dat); - set = bgpio_map(pdev, "set", sz, &err); - if (err) - return err; + set = bgpio_map(pdev, "set", sz); + if (IS_ERR(set)) + return PTR_ERR(set); - clr = bgpio_map(pdev, "clr", sz, &err); - if (err) - return err; + clr = bgpio_map(pdev, "clr", sz); + if (IS_ERR(clr)) + return PTR_ERR(clr); - dirout = bgpio_map(pdev, "dirout", sz, &err); - if (err) - return err; + dirout = bgpio_map(pdev, "dirout", sz); + if (IS_ERR(dirout)) + return PTR_ERR(dirout); - dirin = bgpio_map(pdev, "dirin", sz, &err); - if (err) - return err; + dirin = bgpio_map(pdev, "dirin", sz); + if (IS_ERR(dirin)) + return PTR_ERR(dirin); bgc = devm_kzalloc(&pdev->dev, sizeof(*bgc), GFP_KERNEL); if (!bgc) -- cgit v1.2.3 From b2f68b6306dbdbfd9b8cf46c697b52efa78f9ad6 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 21 Oct 2015 00:12:00 -0700 Subject: gpio: generic: Revert to old error handling in bgpio_map Returning an error instead of NULL in bgpio_map if platform_get_resource_byname does not find a resource was introduced with commit cf3f2a2c8bae ("gpio: generic: improve error handling in bgpio_map"). This results in several qemu runtime failures with default and non-default configurations, if attempts are made to boot from mmcblk0. Examples for failures with multi_v7_defconfig are Machine: vexpress-a9 dtb: vexpress-v2p-ca9 Machine: vexpress-a15 dtb: vexpress-v2p-ca15-tc1 Crash: VFS: Cannot open root device "mmcblk0" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) Looking into the code, always returning an error if bgpio_map fails does not appear to make much sense, since the code in bgpio_setup_io specifically supports some of the resources to be NULL. Fixes: cf3f2a2c8bae ("gpio: generic: improve error handling in bgpio_map") Cc: Heiner Kallweit Signed-off-by: Guenter Roeck Signed-off-by: Linus Walleij --- drivers/gpio/gpio-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpio/gpio-generic.c') diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index d8b1700b9519..bd5193c67a9c 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -586,7 +586,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev, r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); if (!r) - return IOMEM_ERR_PTR(-EINVAL); + return NULL; sz = resource_size(r); if (sz != sane_sz) -- cgit v1.2.3