aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-04 04:14:10 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-05 20:32:32 -0400
commit5690a6267f0f0f15a01eeed143828726627c6ae6 (patch)
treeb2f9038e4e2bb1a1d0d5d805249c928f521de165
parente6528d5e8730b1f75acf035d7c11e06657963581 (diff)
ARM: S3C24XX: Remove s3c2410_gpio_getirq()
Remove s3c2410_gpio_getirq() as the only users is the pm code, and it can be replicated by using gpio_to_irq(). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-s3c24xx/gpio.c19
-rw-r--r--arch/arm/plat-s3c24xx/pm.c2
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c
index 9b3d74c186fc..24c00470b86c 100644
--- a/arch/arm/plat-s3c24xx/gpio.c
+++ b/arch/arm/plat-s3c24xx/gpio.c
@@ -120,22 +120,3 @@ unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change)
120} 120}
121 121
122EXPORT_SYMBOL(s3c2410_modify_misccr); 122EXPORT_SYMBOL(s3c2410_modify_misccr);
123
124int s3c2410_gpio_getirq(unsigned int pin)
125{
126 if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15))
127 return -EINVAL; /* not valid interrupts */
128
129 if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7))
130 return -EINVAL; /* not valid pin */
131
132 if (pin < S3C2410_GPF(4))
133 return (pin - S3C2410_GPF(0)) + IRQ_EINT0;
134
135 if (pin < S3C2410_GPG(0))
136 return (pin - S3C2410_GPF(4)) + IRQ_EINT4;
137
138 return (pin - S3C2410_GPG(0)) + IRQ_EINT8;
139}
140
141EXPORT_SYMBOL(s3c2410_gpio_getirq);
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index 37ea822c5c7b..691fecc61d53 100644
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -91,7 +91,7 @@ static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
91{ 91{
92 unsigned long irqstate; 92 unsigned long irqstate;
93 unsigned long pinstate; 93 unsigned long pinstate;
94 int irq = s3c2410_gpio_getirq(pin); 94 int irq = gpio_to_irq(pin);
95 95
96 if (irqoffs < 4) 96 if (irqoffs < 4)
97 irqstate = s3c_irqwake_intmask & (1L<<irqoffs); 97 irqstate = s3c_irqwake_intmask & (1L<<irqoffs);