ARM: S5PV210: Change to using s3c_gpio_cfgall_range()

Change the code setting a range of GPIO pins' configuration and
pull state to use the recently introduced s3c_gpio_cfgall_range().

Mop up a few missed s3c_gpio_cfgpin_range() changes.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

1 files changed, 20 insertions, 34 deletions

diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 706427837d82..f5499aeb2b6c 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -26,24 +26,20 @@
 void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 {
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-        unsigned int gpio;
 
         /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG0(0); gpio < S5PV210_GPG0(2); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         switch (width) {
         case 8:
                 /* GPG1[3:6] special-funtion 3 */
-                s3c_gpio_cfgpin_range(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
-                for (gpio = S5PV210_GPG1(3); gpio <= S5PV210_GPG1(6); gpio++)
-                        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
+                                      S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
         case 4:
                 /* GPG0[3:6] special-funtion 2 */
-                s3c_gpio_cfgpin_range(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
-                for (gpio = S5PV210_GPG0(3); gpio <= S5PV210_GPG0(6); gpio++)
-                        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4,
+                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
         default:
                 break;
         }
@@ -57,17 +53,14 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
 {
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-        unsigned int gpio;
 
         /* Set all the necessary GPG1[0:1] pins to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG1(0); gpio < S5PV210_GPG1(2); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         /* Data pin GPG1[3:6] to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG1(3); gpio <= S5PV210_GPG1(6); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
                 s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
@@ -78,24 +71,20 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
 void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
 {
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-        unsigned int gpio;
 
         /* Set all the necessary GPG2[0:1] pins to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG2(0); gpio < S5PV210_GPG2(2); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         switch (width) {
         case 8:
                 /* Data pin GPG3[3:6] to special-function 3 */
-                s3c_gpio_cfgpin_range(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
-                for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++)
-                        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
+                                      S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
         case 4:
                 /* Data pin GPG2[3:6] to special-function 2 */
-                s3c_gpio_cfgpin_range(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
-                for (gpio = S5PV210_GPG2(3); gpio <= S5PV210_GPG2(6); gpio++)
-                        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+                s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4,
+                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
         default:
                 break;
         }
@@ -109,17 +98,14 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
 void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
 {
         struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-        unsigned int gpio;
 
         /* Set all the necessary GPG3[0:1] pins to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG3(0); gpio < S5PV210_GPG3(2); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         /* Data pin GPG3[3:6] to special-function 2 */
-        s3c_gpio_cfgpin_range(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
-        for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++)
-                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
 
         if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
                 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);