Btrfs: don't warn in btrfs_add_orphan

[sfrench/cifs-2.6.git] / arch / arm / mach-s5pv310 / setup-i2c1.c

diff --git a/arch/arm/mach-s5pv310/setup-i2c1.c b/arch/arm/mach-s5pv310/setup-i2c1.c
index 1ecd5bc35b5a622877bd579a94fad39ec8975820..9d07e4e2f14cb0ed64e1f084b1ed688ae5c7c7b4 100644 (file)
--- a/arch/arm/mach-s5pv310/setup-i2c1.c
+++ b/arch/arm/mach-s5pv310/setup-i2c1.c
@@ -18,8 +18,6 @@ struct platform_device; /* don't need the contents */
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
 {
-       s3c_gpio_cfgpin(S5PV310_GPD1(2), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV310_GPD1(2), S3C_GPIO_PULL_UP);
-       s3c_gpio_cfgpin(S5PV310_GPD1(3), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV310_GPD1(3), S3C_GPIO_PULL_UP);
+       s3c_gpio_cfgall_range(S5PV310_GPD1(2), 2,
+                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
 }