Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup

3 files changed, 6 insertions, 13 deletions

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 5811a96125f0..404ac7aec3c1 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -595,8 +595,7 @@ static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
 
 static void aquila_setup_sdhci(void)
 {
-        gpio_request(AQUILA_EXT_FLASH_EN, "FLASH_EN");
-        gpio_direction_output(AQUILA_EXT_FLASH_EN, 1);
+        gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");
 
         s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
         s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 15edcae448b9..e2754e9bd6b4 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -227,8 +227,7 @@ static void __init goni_radio_init(void)
         i2c1_devs[0].irq = gpio_to_irq(gpio);
 
         gpio = S5PV210_GPJ2(5);                 /* XMSMDATA_5 */
-        gpio_request(gpio, "FM_RST");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "FM_RST");
 }
 
 /* TSP */
@@ -264,8 +263,7 @@ static void __init goni_tsp_init(void)
         int gpio;
 
         gpio = S5PV210_GPJ1(3);         /* XMSMADDR_11 */
-        gpio_request(gpio, "TSP_LDO_ON");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");
         gpio_export(gpio, 0);
 
         gpio = S5PV210_GPJ0(5);         /* XMSMADDR_5 */
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 8662ef6e5681..513db9234c41 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -153,15 +153,12 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
 {
         if (power) {
 #if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request(S5PV210_GPD0(3), "GPD0");
-                gpio_direction_output(S5PV210_GPD0(3), 1);
+                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");
                 gpio_free(S5PV210_GPD0(3));
 #endif
 
                 /* fire nRESET on power up */
-                gpio_request(S5PV210_GPH0(6), "GPH0");
-
-                gpio_direction_output(S5PV210_GPH0(6), 1);
+                gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");
 
                 gpio_set_value(S5PV210_GPH0(6), 0);
                 mdelay(10);
@@ -172,8 +169,7 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
                 gpio_free(S5PV210_GPH0(6));
         } else {
 #if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request(S5PV210_GPD0(3), "GPD0");
-                gpio_direction_output(S5PV210_GPD0(3), 0);
+                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");
                 gpio_free(S5PV210_GPD0(3));
 #endif
         }