diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-03 17:04:19 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-03 17:04:19 +0300 |
| commit | 8a6abcd04e4cdf6088f11212570c3e5ec36ee5c3 (patch) | |
| tree | 21dfb07a1789424d20c2a8f2f8989f8c19ef48b3 /drivers/gpio/gpio-ixp4xx.c | |
| parent | f6a7053ddcf1c05c443715d627507f0ab9a0b491 (diff) | |
| parent | f2ee73147a3f23cc4b032a76b5677b4b8441ba74 (diff) | |
| download | linux-8a6abcd04e4cdf6088f11212570c3e5ec36ee5c3.tar.xz | |
Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel
gpio: updates for v5.4
- use a helper variable for &pdev->dev in gpio-em
- tweak the ifdefs in GPIO headers
- fix function links in HTML docs
- remove an unneeded error message from ixp4xx
- use the optional clk_get in gpio-mxc instead of checking the return value
- a couple improvements in pca953x
- allow to build gpio-lpc32xx on non-lpc32xx targets
Diffstat (limited to 'drivers/gpio/gpio-ixp4xx.c')
| -rw-r--r-- | drivers/gpio/gpio-ixp4xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c index 1a57e74fdb91..b3b050604e0b 100644 --- a/drivers/gpio/gpio-ixp4xx.c +++ b/drivers/gpio/gpio-ixp4xx.c @@ -204,10 +204,8 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); g->base = devm_ioremap_resource(dev, res); - if (IS_ERR(g->base)) { - dev_err(dev, "ioremap error\n"); + if (IS_ERR(g->base)) return PTR_ERR(g->base); - } /* * When we convert to device tree we will simply look up the |