From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rojhalat Ibrahim Subject: [PATCH 2/2] mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions Date: Fri, 09 Jan 2015 16:19:52 +0100 Message-ID: <13407316.QPemVgjPDO@pcimr> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from mail-out.m-online.net ([212.18.0.10]:42398 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757725AbbAIP1z (ORCPT ); Fri, 9 Jan 2015 10:27:55 -0500 Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: "linux-gpio@vger.kernel.org" Cc: Alexandre Courbot , Linus Walleij , David Miller , netdev@vger.kernel.org Use the new gpiod_get_array and gpiod_put_array functions for obtaining and disposing of GPIO descriptors. Signed-off-by: Rojhalat Ibrahim --- This patch depends on my previous patch "gpiolib: add gpiod_get_array and gpiod_put_array functions". drivers/net/phy/mdio-mux-gpio.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c index 1eaf81e..35c37da 100644 --- a/drivers/net/phy/mdio-mux-gpio.c +++ b/drivers/net/phy/mdio-mux-gpio.c @@ -47,7 +47,6 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev) { struct mdio_mux_gpio_state *s; int num_gpios; - unsigned int n; int r; if (!pdev->dev.of_node) @@ -63,16 +62,10 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev) s->num_gpios = num_gpios; - for (n = 0; n < num_gpios; ) { - struct gpio_desc *gpio = gpiod_get_index(&pdev->dev, NULL, n, - GPIOD_OUT_LOW); - if (IS_ERR(gpio)) { - r = PTR_ERR(gpio); - goto err; - } - s->gpio[n] = gpio; - n++; - } + r = gpiod_get_array(&pdev->dev, NULL, s->gpio, num_gpios, + GPIOD_OUT_LOW); + if (r != num_gpios) + return r; r = mdio_mux_init(&pdev->dev, mdio_mux_gpio_switch_fn, &s->mux_handle, s); @@ -80,22 +73,17 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev) if (r == 0) { pdev->dev.platform_data = s; return 0; + } else { + gpiod_put_array(s->gpio, num_gpios); + return r; } -err: - while (n) { - n--; - gpiod_put(s->gpio[n]); - } - return r; } static int mdio_mux_gpio_remove(struct platform_device *pdev) { - unsigned int n; struct mdio_mux_gpio_state *s = dev_get_platdata(&pdev->dev); mdio_mux_uninit(s->mux_handle); - for (n = 0; n < s->num_gpios; n++) - gpiod_put(s->gpio[n]); + gpiod_put_array(s->gpio, s->num_gpios); return 0; } -- 2.0.5