aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@openmoko.org>2008-11-19 17:09:38 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:09:38 +0000
commitd278591fdbcd7a1592fb0810b8c3c30e2004dd6c (patch)
tree790cd84fb2470eab01978dd10a9f2365ba6c317e
parent89dbf8090444ef01d49c278ea9fae6321df54664 (diff)
Remove not needed #ifdef as machine_is_ is always defined.
If we build a kernel without gta01/gta02 the machine_is_ macro will expand to (0) and the compiler will optimize the if (0) {} away. Signed-Off-By: Holger Freyther <zecke@openmoko.org>
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gsm.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index f22cad859a7..cde3dd83d1c 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -63,16 +63,13 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
goto out_1;
} else if (!strcmp(attr->attr.name, "download")) {
-#ifdef CONFIG_MACH_NEO1973_GTA01
- if (machine_is_neo1973_gta01())
+ if (machine_is_neo1973_gta01()) {
if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
goto out_1;
-#endif
-#ifdef CONFIG_MACH_NEO1973_GTA02
- if (machine_is_neo1973_gta02())
+ } else if (machine_is_neo1973_gta02()) {
if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
goto out_1;
-#endif
+ }
}
return strlcpy(buf, "0\n", 3);
@@ -140,11 +137,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
} else if (!strcmp(attr->attr.name, "reset")) {
s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
} else if (!strcmp(attr->attr.name, "download")) {
-#ifdef CONFIG_MACH_NEO1973_GTA01
if (machine_is_neo1973_gta01())
s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-#endif
-#ifdef CONFIG_MACH_NEO1973_GTA02
+
if (machine_is_neo1973_gta02()) {
/*
* the keyboard / buttons driver requests and enables
@@ -168,7 +163,6 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
gta01_gsm.gpio_ndl_gsm = !on;
s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
}
-#endif
}
return count;