]> Pileus Git - ~andy/linux/commitdiff
gpio: tb10x: fix return value check in tb10x_gpio_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Wed, 30 Oct 2013 03:09:15 +0000 (11:09 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 30 Oct 2013 18:28:14 +0000 (11:28 -0700)
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR(). Also remove the dev_err call to avoid redundant
error message.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-tb10x.c

index af4975c20d85347dcfc8af599a0ee35ea215ff1b..0502b9a041a50a199b40f4d3bf956bcd81dc7fdf 100644 (file)
@@ -207,10 +207,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
        spin_lock_init(&tb10x_gpio->spinlock);
 
        tb10x_gpio->base = devm_ioremap_resource(&pdev->dev, mem);
-       if (!tb10x_gpio->base) {
-               dev_err(&pdev->dev, "Could not remap reg space.\n");
-               goto fail_ioremap;
-       }
+       if (IS_ERR(tb10x_gpio->base))
+               return PTR_ERR(tb10x_gpio->base);
 
        tb10x_gpio->gc.label            = of_node_full_name(dn);
        tb10x_gpio->gc.dev              = &pdev->dev;