dma: ipu: irq_data conversion.
PATCH 1/1 dma: ipu: irq_data conversion.
Signed-off-by Lennert Buytenhek <[email protected]>
--- drivers/dma/ipu/ipu_irq.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/dma/ipu/ipu_irq.c +13 -13
@@ -94,9 +94,9 @@ static struct ipu_irq_map *src2map(unsigned int src)return NULL ; } -static void ipu_irq_unmask (unsigned int irq) +static void ipu_irq_unmask (struct irq_data *d) { -struct ipu_irq_map *map =get_irq_chip_data (irq); +struct ipu_irq_map *map =irq_data_get_irq_chip_data (d);struct ipu_irq_bank *bank;uint32_t reg;unsigned long lock_flags;
@@ -106,7 +106,7 @@ static void ipu_irq_unmask(unsigned int irq) bank = map->bank;if (!bank) {spin_unlock_irqrestore (&bank_lock, lock_flags); -pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, irq); +pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, d->irq);return ; }
@@ -117,9 +117,9 @@ static void ipu_irq_unmask(unsigned int irq)spin_unlock_irqrestore (&bank_lock, lock_flags); } -static void ipu_irq_mask (unsigned int irq) +static void ipu_irq_mask (struct irq_data *d) { -struct ipu_irq_map *map =get_irq_chip_data (irq); +struct ipu_irq_map *map =irq_data_get_irq_chip_data (d);struct ipu_irq_bank *bank;uint32_t reg;unsigned long lock_flags;
@@ -129,7 +129,7 @@ static void ipu_irq_mask(unsigned int irq) bank = map->bank;if (!bank) {spin_unlock_irqrestore (&bank_lock, lock_flags); -pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, irq); +pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, d->irq);return ; }
@@ -140,9 +140,9 @@ static void ipu_irq_mask(unsigned int irq)spin_unlock_irqrestore (&bank_lock, lock_flags); } -static void ipu_irq_ack (unsigned int irq) +static void ipu_irq_ack (struct irq_data *d) { -struct ipu_irq_map *map =get_irq_chip_data (irq); +struct ipu_irq_map *map =irq_data_get_irq_chip_data (d);struct ipu_irq_bank *bank;unsigned long lock_flags;
@@ -151,7 +151,7 @@ static void ipu_irq_ack(unsigned int irq) bank = map->bank;if (!bank) {spin_unlock_irqrestore (&bank_lock, lock_flags); -pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, irq); +pr_err ("IPU: %s(%u) - unmapped!\n" , __func__, d->irq);return ; }
@@ -345,10 +345,10 @@ static void ipu_irq_fn(unsigned int irq, struct irq_desc *desc) }static struct irq_chip ipu_irq_chip = { - .name ="ipu_irq" , - .ack = ipu_irq_ack, - .mask = ipu_irq_mask, - .unmask = ipu_irq_unmask, + .name ="ipu_irq" , + .irq_ack = ipu_irq_ack, + .irq_mask = ipu_irq_mask, + .irq_unmask = ipu_irq_unmask, };/* Install the IRQ handler */
Signature · 1 line
1.7.1