From mboxrd@z Thu Jan 1 00:00:00 1970 From: festevam@gmail.com (Fabio Estevam) Date: Wed, 9 Nov 2011 18:36:38 -0200 Subject: [PATCH v2] ARM: mx28evk: Simplify GPIO requests for mx28evk_fec_reset Message-ID: <1320870998-6200-1-git-send-email-festevam@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Fabio Estevam Simplify GPIO requests inside mx28evk_fec_reset by using gpio_request_array. Signed-off-by: Fabio Estevam --- Changes since v1: - Make mx28evk_fec_gpios const arch/arm/mach-mxs/mach-mx28evk.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index ac2316d..c565c33 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -219,6 +219,11 @@ static const struct gpio_led_platform_data mx28evk_led_data __initconst = { .num_leds = ARRAY_SIZE(mx28evk_leds), }; +static const struct gpio mx28evk_fec_gpios[] __initconst = { + { MX28EVK_FEC_PHY_POWER, GPIOF_OUT_INIT_LOW, "fec-power" }, + { MX28EVK_FEC_PHY_RESET, GPIOF_OUT_INIT_LOW, "fec-enable" }, +}; + /* fec */ static void __init mx28evk_fec_reset(void) { @@ -231,28 +236,10 @@ static void __init mx28evk_fec_reset(void) clk_enable(clk); /* Power up fec phy */ - ret = gpio_request(MX28EVK_FEC_PHY_POWER, "fec-phy-power"); - if (ret) { - pr_err("Failed to request gpio fec-phy-%s: %d\n", "power", ret); - return; - } - - ret = gpio_direction_output(MX28EVK_FEC_PHY_POWER, 0); - if (ret) { - pr_err("Failed to drive gpio fec-phy-%s: %d\n", "power", ret); - return; - } - - /* Reset fec phy */ - ret = gpio_request(MX28EVK_FEC_PHY_RESET, "fec-phy-reset"); - if (ret) { - pr_err("Failed to request gpio fec-phy-%s: %d\n", "reset", ret); - return; - } - - gpio_direction_output(MX28EVK_FEC_PHY_RESET, 0); + ret = gpio_request_array(mx28evk_fec_gpios, + ARRAY_SIZE(mx28evk_fec_gpios)); if (ret) { - pr_err("Failed to drive gpio fec-phy-%s: %d\n", "reset", ret); + pr_err("Failed to request FEC gpios: %d\n", ret); return; } -- 1.7.1