pinctrl-tb10x: remove duplicate check on resource
authorVarka Bhadram <varkabhadram@gmail.com>
Tue, 21 Oct 2014 09:06:59 +0000 (14:36 +0530)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 28 Oct 2014 16:15:20 +0000 (17:15 +0100)
Sanity check on resource happening with devm_ioremap_resource().

Signed-off-by: Varka Bhadram <varkab@cdac.in>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-tb10x.c

index 3b9bfcf717ac3eb1401074d47caa05ae7bddb10a..9363563f977782f3efb487284462ab594058b6fd 100644 (file)
@@ -759,7 +759,7 @@ static struct pinctrl_desc tb10x_pindesc = {
 static int tb10x_pinctrl_probe(struct platform_device *pdev)
 {
        int ret = -EINVAL;
-       struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct resource *mem;
        struct device *dev = &pdev->dev;
        struct device_node *of_node = dev->of_node;
        struct device_node *child;
@@ -771,11 +771,6 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       if (!mem) {
-               dev_err(dev, "No memory resource defined.\n");
-               return -EINVAL;
-       }
-
        state = devm_kzalloc(dev, sizeof(struct tb10x_pinctrl) +
                                        of_get_child_count(of_node)
                                        * sizeof(struct tb10x_of_pinfunc),
@@ -787,6 +782,7 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev)
        state->pinfuncs = (struct tb10x_of_pinfunc *)(state + 1);
        mutex_init(&state->mutex);
 
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        state->base = devm_ioremap_resource(dev, mem);
        if (IS_ERR(state->base)) {
                ret = PTR_ERR(state->base);