Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 00:29:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: integrator: irq_data conversion.

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Lennert Buytenhek 2010-11-29 10:31:33 +01:00
parent c971ab0d96
commit c3ef3ccadb
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-integrator/integrator_ap.c
View File

@ -156,21 +156,21 @@ static void __init ap_map_io(void)
#define INTEGRATOR_SC_VALID_INT 0x003fffff #define INTEGRATOR_SC_VALID_INT 0x003fffff
static void sc_mask_irq(unsigned int irq) static void sc_mask_irq(struct irq_data *d)
{ {
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR); writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
} }
static void sc_unmask_irq(unsigned int irq) static void sc_unmask_irq(struct irq_data *d)
{ {
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET); writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_SET);
} }
static struct irq_chip sc_chip = { static struct irq_chip sc_chip = {
.name = "SC", .name = "SC",
.ack = sc_mask_irq, .irq_ack = sc_mask_irq,
.mask = sc_mask_irq, .irq_mask = sc_mask_irq,
.unmask = sc_unmask_irq, .irq_unmask = sc_unmask_irq,
}; };
static void __init ap_init_irq(void) static void __init ap_init_irq(void)

48
arch/arm/mach-integrator/integrator_cp.c
View File

@ -146,61 +146,61 @@ static void __init intcp_map_io(void)
#define sic_writel __raw_writel #define sic_writel __raw_writel
#define sic_readl __raw_readl #define sic_readl __raw_readl
static void cic_mask_irq(unsigned int irq) static void cic_mask_irq(struct irq_data *d)
{ {
irq -= IRQ_CIC_START; unsigned int irq = d->irq - IRQ_CIC_START;
cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_CLEAR); cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_CLEAR);
} }
static void cic_unmask_irq(unsigned int irq) static void cic_unmask_irq(struct irq_data *d)
{ {
irq -= IRQ_CIC_START; unsigned int irq = d->irq - IRQ_CIC_START;
cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET); cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
} }
static struct irq_chip cic_chip = { static struct irq_chip cic_chip = {
.name = "CIC", .name = "CIC",
.ack = cic_mask_irq, .irq_ack = cic_mask_irq,
.mask = cic_mask_irq, .irq_mask = cic_mask_irq,
.unmask = cic_unmask_irq, .irq_unmask = cic_unmask_irq,
}; };
static void pic_mask_irq(unsigned int irq) static void pic_mask_irq(struct irq_data *d)
{ {
irq -= IRQ_PIC_START; unsigned int irq = d->irq - IRQ_PIC_START;
pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_CLEAR); pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_CLEAR);
} }
static void pic_unmask_irq(unsigned int irq) static void pic_unmask_irq(struct irq_data *d)
{ {
irq -= IRQ_PIC_START; unsigned int irq = d->irq - IRQ_PIC_START;
pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET); pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
} }
static struct irq_chip pic_chip = { static struct irq_chip pic_chip = {
.name = "PIC", .name = "PIC",
.ack = pic_mask_irq, .irq_ack = pic_mask_irq,
.mask = pic_mask_irq, .irq_mask = pic_mask_irq,
.unmask = pic_unmask_irq, .irq_unmask = pic_unmask_irq,
}; };
static void sic_mask_irq(unsigned int irq) static void sic_mask_irq(struct irq_data *d)
{ {
irq -= IRQ_SIC_START; unsigned int irq = d->irq - IRQ_SIC_START;
sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_CLEAR); sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_CLEAR);
} }
static void sic_unmask_irq(unsigned int irq) static void sic_unmask_irq(struct irq_data *d)
{ {
irq -= IRQ_SIC_START; unsigned int irq = d->irq - IRQ_SIC_START;
sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET); sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
} }
static struct irq_chip sic_chip = { static struct irq_chip sic_chip = {
.name = "SIC", .name = "SIC",
.ack = sic_mask_irq, .irq_ack = sic_mask_irq,
.mask = sic_mask_irq, .irq_mask = sic_mask_irq,
.unmask = sic_unmask_irq, .irq_unmask = sic_unmask_irq,
}; };
static void static void