diff options
-rw-r--r-- | arch/arm/plat-s3c24xx/gpio.c | 19 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index 9b3d74c186f..24c00470b86 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 | ||
122 | EXPORT_SYMBOL(s3c2410_modify_misccr); | 122 | EXPORT_SYMBOL(s3c2410_modify_misccr); |
123 | |||
124 | int 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 | |||
141 | EXPORT_SYMBOL(s3c2410_gpio_getirq); | ||
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index 37ea822c5c7..691fecc61d5 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); |