aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2015-01-18 06:39:27 -0500
committerLinus Walleij <linus.walleij@linaro.org>2015-01-20 05:18:33 -0500
commit080440a27403c906e8ed67660344fca4b757ed8d (patch)
tree8bac36696f9ddb841c1275db70ab5e7eb00e301f /drivers/gpio
parentf91b2dbba5fdbe2d211aa8a4b353a8d3b5126f45 (diff)
gpio :gpio-mm-lantiq: Use devm_kzalloc
Replace kzalloc with the device managed devm_kzalloc Cc: Alexandre Courbot <gnurou@gmail.com> Cc: John Crispin <blogic@openwrt.org> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-mm-lantiq.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c
index f228b1ce0ce0..789016397c4f 100644
--- a/drivers/gpio/gpio-mm-lantiq.c
+++ b/drivers/gpio/gpio-mm-lantiq.c
@@ -107,14 +107,13 @@ static int ltq_mm_probe(struct platform_device *pdev)
107 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 107 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
108 struct ltq_mm *chip; 108 struct ltq_mm *chip;
109 const __be32 *shadow; 109 const __be32 *shadow;
110 int ret = 0;
111 110
112 if (!res) { 111 if (!res) {
113 dev_err(&pdev->dev, "failed to get memory resource\n"); 112 dev_err(&pdev->dev, "failed to get memory resource\n");
114 return -ENOENT; 113 return -ENOENT;
115 } 114 }
116 115
117 chip = kzalloc(sizeof(*chip), GFP_KERNEL); 116 chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
118 if (!chip) 117 if (!chip)
119 return -ENOMEM; 118 return -ENOMEM;
120 119
@@ -129,10 +128,7 @@ static int ltq_mm_probe(struct platform_device *pdev)
129 if (shadow) 128 if (shadow)
130 chip->shadow = be32_to_cpu(*shadow); 129 chip->shadow = be32_to_cpu(*shadow);
131 130
132 ret = of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip); 131 return of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip);
133 if (ret)
134 kfree(chip);
135 return ret;
136} 132}
137 133
138static const struct of_device_id ltq_mm_match[] = { 134static const struct of_device_id ltq_mm_match[] = {