From bc97f3da9821d586d2fcbbd45be8865bbbbb72e3 Mon Sep 17 00:00:00 2001
From: Holger Freyther <[EMAIL PROTECTED]>
Date: Thu, 10 Apr 2008 04:50:13 +0200
Subject: [PATCH] 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 <[EMAIL PROTECTED]>
---
arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index 8abc3ef..286a660 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);
@@ -138,12 +135,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()) {
+ else if (machine_is_neo1973_gta02()) {
/* FIXME: Layering violation, we know how this relates
to
* the Jack-IRQ. And we assume the keyboard driver to be
* around. */
@@ -155,7 +149,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;
--
1.5.3
