mfd: Convert tc6393xb driver to new irq_ APIs
PATCH 1/1 mfd: Convert tc6393xb driver to new irq_ APIs
The genirq core is being update to pass struct irq_data to irq_chip rather than an irq number to operations. Update tc6393 to the new API.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/tc6393xb.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/mfd/tc6393xb.c +11 -11
@@ -527,41 +527,41 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc) } } -static void tc6393xb_irq_ack (unsigned int irq) +static void tc6393xb_irq_ack (struct irq_data *data) { } -static void tc6393xb_irq_mask (unsigned int irq) +static void tc6393xb_irq_mask (struct irq_data *data) { -struct tc6393xb *tc6393xb =get_irq_chip_data (irq); +struct tc6393xb *tc6393xb =irq_data_get_irq_chip_data (data);unsigned long flags;u8 imr;spin_lock_irqsave (&tc6393xb->lock, flags); imr =tmio_ioread8 (tc6393xb->scr +SCR_IMR ); - imr |=1 << (irq - tc6393xb->irq_base); + imr |=1 << (data->irq - tc6393xb->irq_base);tmio_iowrite8 (imr, tc6393xb->scr +SCR_IMR );spin_unlock_irqrestore (&tc6393xb->lock, flags); } -static void tc6393xb_irq_unmask (unsigned int irq) +static void tc6393xb_irq_unmask (struct irq_data *data) { -struct tc6393xb *tc6393xb =get_irq_chip_data (irq); +struct tc6393xb *tc6393xb =irq_data_get_irq_chip_data (data);unsigned long flags;u8 imr;spin_lock_irqsave (&tc6393xb->lock, flags); imr =tmio_ioread8 (tc6393xb->scr +SCR_IMR ); - imr &= ~(1 << (irq - tc6393xb->irq_base)); + imr &= ~(1 << (data->irq - tc6393xb->irq_base));tmio_iowrite8 (imr, tc6393xb->scr +SCR_IMR );spin_unlock_irqrestore (&tc6393xb->lock, flags); }static struct irq_chip tc6393xb_chip = { - .name ="tc6393xb" , - .ack = tc6393xb_irq_ack, - .mask = tc6393xb_irq_mask, - .unmask = tc6393xb_irq_unmask, + .name ="tc6393xb" , + .irq_ack = tc6393xb_irq_ack, + .irq_mask = tc6393xb_irq_mask, + .irq_unmask = tc6393xb_irq_unmask, };static void tc6393xb_attach_irq (struct platform_device *dev)
Signature · 1 line
1.7.2.3
You can add my:
Acked-by Ian Molton <[email protected]>
To this and the TMIO and ASIC3 drivers :)
Signature · 7 lines
Ian Molton Linux, Automotive, and other hacking: http://www.mnementh.co.uk/ On 12 December 2010 12:34, Mark Brown
Quoted 69 lines · <[email protected]> wrote:
The genirq core is being update to pass struct
irq_datatoirq_chiprather than an irq number to operations. Update tc6393 to the new API.Signed-off-by Mark Brown <[email protected]>---
drivers/mfd/tc6393xb.c | 22 +++++++++++-----------1 files changed, 11 insertions(+), 11 deletions(-)drivers/mfd/tc6393xb.c +11
-12@@ -527,41 +527,41 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc) } } -static void tc6393xb_irq_ack (unsigned int irq) +static void tc6393xb_irq_ack (struct irq_data *data) { } -static void tc6393xb_irq_mask (unsigned int irq) +static void tc6393xb_irq_mask (struct irq_data *data) { - struct tc6393xb *tc6393xb = get_irq_chip_data(irq); + struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(data); unsigned long flags; u8 imr; spin_lock_irqsave(&tc6393xb->lock, flags); imr = tmio_ioread8(tc6393xb->scr + SCR_IMR); - imr |= 1 << (irq - tc6393xb->irq_base); + imr |= 1 << (data->irq - tc6393xb->irq_base); tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR); spin_unlock_irqrestore(&tc6393xb->lock, flags); } -static void tc6393xb_irq_unmask (unsigned int irq) +static void tc6393xb_irq_unmask (struct irq_data *data) { - struct tc6393xb *tc6393xb = get_irq_chip_data(irq); + struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(data); unsigned long flags; u8 imr; spin_lock_irqsave(&tc6393xb->lock, flags); imr = tmio_ioread8(tc6393xb->scr + SCR_IMR); - imr &= ~(1 << (irq - tc6393xb->irq_base)); + imr &= ~(1 << (data->irq - tc6393xb->irq_base)); tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR); spin_unlock_irqrestore(&tc6393xb->lock, flags); } static struct irq_chip tc6393xb_chip = { - .name = "tc6393xb", - .ack = tc6393xb_irq_ack, - .mask = tc6393xb_irq_mask, - .unmask = tc6393xb_irq_unmask, + .name = "tc6393xb", + .irq_ack = tc6393xb_irq_ack, + .irq_mask = tc6393xb_irq_mask, + .irq_unmask = tc6393xb_irq_unmask, }; static void tc6393xb_attach_irq(struct platform_device *dev) --1.7.2.3