diff options
Diffstat (limited to 'drivers/gpio/gpio-stmpe.c')
-rw-r--r-- | drivers/gpio/gpio-stmpe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index 3ce5bc38ac31..b33bad1bb4df 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c | |||
@@ -271,8 +271,8 @@ static irqreturn_t stmpe_gpio_irq(int irq, void *dev) | |||
271 | return IRQ_HANDLED; | 271 | return IRQ_HANDLED; |
272 | } | 272 | } |
273 | 273 | ||
274 | int stmpe_gpio_irq_map(struct irq_domain *d, unsigned int virq, | 274 | static int stmpe_gpio_irq_map(struct irq_domain *d, unsigned int virq, |
275 | irq_hw_number_t hwirq) | 275 | irq_hw_number_t hwirq) |
276 | { | 276 | { |
277 | struct stmpe_gpio *stmpe_gpio = d->host_data; | 277 | struct stmpe_gpio *stmpe_gpio = d->host_data; |
278 | 278 | ||
@@ -292,7 +292,7 @@ int stmpe_gpio_irq_map(struct irq_domain *d, unsigned int virq, | |||
292 | return 0; | 292 | return 0; |
293 | } | 293 | } |
294 | 294 | ||
295 | void stmpe_gpio_irq_unmap(struct irq_domain *d, unsigned int virq) | 295 | static void stmpe_gpio_irq_unmap(struct irq_domain *d, unsigned int virq) |
296 | { | 296 | { |
297 | #ifdef CONFIG_ARM | 297 | #ifdef CONFIG_ARM |
298 | set_irq_flags(virq, 0); | 298 | set_irq_flags(virq, 0); |
@@ -431,7 +431,6 @@ static int stmpe_gpio_remove(struct platform_device *pdev) | |||
431 | if (irq >= 0) | 431 | if (irq >= 0) |
432 | free_irq(irq, stmpe_gpio); | 432 | free_irq(irq, stmpe_gpio); |
433 | 433 | ||
434 | platform_set_drvdata(pdev, NULL); | ||
435 | kfree(stmpe_gpio); | 434 | kfree(stmpe_gpio); |
436 | 435 | ||
437 | return 0; | 436 | return 0; |