redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MFD: twl6040: Remove wrapper for threaded irq request 

Remove the twl6040_request_irq/free_irq inline functions,
and use direct calls instead in the core driver to
register the threaded irq.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
hifive-unleashed-5.1
Peter Ujfalusi 2011-07-04 20:16:23 +03:00
parent d20e1d21fd
commit 1b7c4725e2
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mfd/twl6040-core.c
View File

@ -502,9 +502,9 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
if (ret)
goto gpio2_err;
ret = twl6040_request_irq(twl6040, TWL6040_IRQ_READY,
twl6040_naudint_handler, 0,
"twl6040_irq_ready", twl6040);
ret = request_threaded_irq(twl6040->irq_base + TWL6040_IRQ_READY,
NULL, twl6040_naudint_handler, 0,
"twl6040_irq_ready", twl6040);
if (ret) {
dev_err(twl6040->dev, "READY IRQ request failed: %d\n",
ret);
@ -557,7 +557,7 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
return 0;
mfd_err:
twl6040_free_irq(twl6040, TWL6040_IRQ_READY, twl6040);
free_irq(twl6040->irq_base + TWL6040_IRQ_READY, twl6040);
irq_err:
twl6040_irq_exit(twl6040);
gpio2_err:
@ -580,7 +580,7 @@ static int __devexit twl6040_remove(struct platform_device *pdev)
if (gpio_is_valid(twl6040->audpwron))
gpio_free(twl6040->audpwron);
twl6040_free_irq(twl6040, TWL6040_IRQ_READY, twl6040);
free_irq(twl6040->irq_base + TWL6040_IRQ_READY, twl6040);
twl6040_irq_exit(twl6040);
mfd_remove_devices(&pdev->dev);

22
include/linux/mfd/twl6040.h
View File

@ -215,28 +215,6 @@ struct twl6040 {
u8 irq_masks_cache;
};
static inline int twl6040_request_irq(struct twl6040 *twl6040, int irq,
irq_handler_t handler,
unsigned long irqflags,
const char *name,
void *data)
{
if (!twl6040->irq_base)
return -EINVAL;
return request_threaded_irq(twl6040->irq_base + irq, NULL, handler,
irqflags, name, data);
}
static inline void twl6040_free_irq(struct twl6040 *twl6040, int irq,
void *data)
{
if (!twl6040->irq_base)
return;
free_irq(twl6040->irq_base + irq, data);
}
int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg);
int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg,
u8 val);