]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl: single: Drop pointless macro
authorTony Lindgren <tony@atomide.com>
Tue, 25 Oct 2016 16:09:00 +0000 (09:09 -0700)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 28 Oct 2016 11:54:00 +0000 (13:54 +0200)
This is left over from initial experiments with more properties.
It's only used in one place, so let's just get rid of it to make
the code more readable.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-single.c

index d125f3f502be4b3fe0fb293d18835fb1c4370711..7cc9b7dc86569f515d4c62ca97bf4f2a9de3685a 100644 (file)
@@ -1472,15 +1472,6 @@ static void pcs_free_resources(struct pcs_device *pcs)
        pcs_free_pingroups(pcs);
 }
 
-#define PCS_GET_PROP_U32(name, reg, err)                               \
-       do {                                                            \
-               ret = of_property_read_u32(np, name, reg);              \
-               if (ret) {                                              \
-                       dev_err(pcs->dev, err);                         \
-                       return ret;                                     \
-               }                                                       \
-       } while (0);
-
 static const struct of_device_id pcs_of_match[];
 
 static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
@@ -1825,8 +1816,13 @@ static int pcs_probe(struct platform_device *pdev)
        pcs->flags = soc->flags;
        memcpy(&pcs->socdata, soc, sizeof(*soc));
 
-       PCS_GET_PROP_U32("pinctrl-single,register-width", &pcs->width,
-                        "register width not specified\n");
+       ret = of_property_read_u32(np, "pinctrl-single,register-width",
+                                  &pcs->width);
+       if (ret) {
+               dev_err(pcs->dev, "register width not specified\n");
+
+               return ret;
+       }
 
        ret = of_property_read_u32(np, "pinctrl-single,function-mask",
                                   &pcs->fmask);