1 files changed, 7 insertions, 14 deletions

diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index f5499aeb2b6c..927d58850fcb 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -34,12 +34,10 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
         switch (width) {
         case 8:
                 /* GPG1[3:6] special-funtion 3 */
-                s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
-                                      S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
         case 4:
                 /* GPG0[3:6] special-funtion 2 */
-                s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4,
-                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
         default:
                 break;
         }
@@ -55,12 +53,10 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
         /* Set all the necessary GPG1[0:1] pins to special-function 2 */
-        s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
 
         /* Data pin GPG1[3:6] to special-function 2 */
-        s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
 
         if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
                 s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
@@ -73,18 +69,15 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
         /* Set all the necessary GPG2[0:1] pins to special-function 2 */
-        s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
 
         switch (width) {
         case 8:
                 /* Data pin GPG3[3:6] to special-function 3 */
-                s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
-                                      S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
         case 4:
                 /* Data pin GPG2[3:6] to special-function 2 */
-                s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4,
-                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
         default:
                 break;
         }