diff options
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-wlan.c | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-wlan.c b/arch/arm/mach-ux500/board-mop500-wlan.c index 84c1b8958fa..e14773c7823 100644 --- a/arch/arm/mach-ux500/board-mop500-wlan.c +++ b/arch/arm/mach-ux500/board-mop500-wlan.c @@ -11,12 +11,9 @@ #include <linux/regulator/consumer.h> #include <asm/mach-types.h> #include <mach/irqs.h> -#include <plat/pincfg.h> #include <linux/clk.h> #include <mach/cw1200_plat.h> -#include "pins.h" - static void cw1200_release(struct device *dev); static int cw1200_power_ctrl(const struct cw1200_platform_data *pdata, bool enable); @@ -72,34 +69,6 @@ const struct cw1200_platform_data *cw1200_get_platform_data(void) } EXPORT_SYMBOL_GPL(cw1200_get_platform_data); -static int cw1200_pins_enable(bool enable) -{ - struct ux500_pins *pins = NULL; - int ret = 0; - - pins = ux500_pins_get("sdi1"); - - if (!pins) { - printk(KERN_ERR "cw1200: Pins are not found. " - "Check platform data.\n"); - return -ENOENT; - } - - if (enable) - ret = ux500_pins_enable(pins); - else - ret = ux500_pins_disable(pins); - - if (ret) - printk(KERN_ERR "cw1200: Pins can not be %s: %d.\n", - enable ? "enabled" : "disabled", - ret); - - ux500_pins_put(pins); - - return ret; -} - static int cw1200_power_ctrl(const struct cw1200_platform_data *pdata, bool enable) { @@ -164,8 +133,6 @@ static int cw1200_clk_ctrl(const struct cw1200_platform_data *pdata, int __init mop500_wlan_init(void) { - int ret; - if (machine_is_u8500() || machine_is_nomadik() || machine_is_snowball()) { @@ -196,18 +163,10 @@ int __init mop500_wlan_init(void) if (machine_is_snowball()) cw1200_platform_data.power_ctrl = cw1200_power_ctrl; - ret = cw1200_pins_enable(true); - if (WARN_ON(ret)) - return ret; - - ret = platform_device_register(&cw1200_device); - if (ret) - cw1200_pins_enable(false); - - return ret; + return platform_device_register(&cw1200_device); } static void cw1200_release(struct device *dev) { - cw1200_pins_enable(false); + /* Do nothing: release is handled by SDIO stack */ } |