git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
avr32
/
mach-at32ap
/
extint.c
diff --git
a/arch/avr32/mach-at32ap/extint.c
b/arch/avr32/mach-at32ap/extint.c
index
47ba4b9
..
cfb298d
100644
(file)
--- a/
arch/avr32/mach-at32ap/extint.c
+++ b/
arch/avr32/mach-at32ap/extint.c
@@
-61,34
+61,34
@@
struct eic {
static struct eic *nmi_eic;
static bool nmi_enabled;
static struct eic *nmi_eic;
static bool nmi_enabled;
-static void eic_ack_irq(struct irq_
chip
*d)
+static void eic_ack_irq(struct irq_
data
*d)
{
{
- struct eic *eic = irq_data_get_irq_chip_data(d
ata
);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
}
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
}
-static void eic_mask_irq(struct irq_
chip
*d)
+static void eic_mask_irq(struct irq_
data
*d)
{
{
- struct eic *eic = irq_data_get_irq_chip_data(d
ata
);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}
-static void eic_mask_ack_irq(struct irq_
chip
*d)
+static void eic_mask_ack_irq(struct irq_
data
*d)
{
{
- struct eic *eic = irq_data_get_irq_chip_data(d
ata
);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
}
-static void eic_unmask_irq(struct irq_
chip
*d)
+static void eic_unmask_irq(struct irq_
data
*d)
{
{
- struct eic *eic = irq_data_get_irq_chip_data(d
ata
);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
eic_writel(eic, IER, 1 << (d->irq - eic->first_irq));
}
eic_writel(eic, IER, 1 << (d->irq - eic->first_irq));
}
-static int eic_set_irq_type(struct irq_
chip
*d, unsigned int flow_type)
+static int eic_set_irq_type(struct irq_
data
*d, unsigned int flow_type)
{
{
- struct eic *eic = irq_data_get_irq_chip_data(d
ata
);
+ struct eic *eic = irq_data_get_irq_chip_data(d);
unsigned int irq = d->irq;
unsigned int i = irq - eic->first_irq;
u32 mode, edge, level;
unsigned int irq = d->irq;
unsigned int i = irq - eic->first_irq;
u32 mode, edge, level;
@@
-191,7
+191,7
@@
static int __init eic_probe(struct platform_device *pdev)
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
int_irq = platform_get_irq(pdev, 0);
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
int_irq = platform_get_irq(pdev, 0);
- if (!regs ||
!int_irq
) {
+ if (!regs ||
(int)int_irq <= 0
) {
dev_dbg(&pdev->dev, "missing regs and/or irq resource\n");
return -ENXIO;
}
dev_dbg(&pdev->dev, "missing regs and/or irq resource\n");
return -ENXIO;
}
@@
-204,7
+204,7
@@
static int __init eic_probe(struct platform_device *pdev)
}
eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id;
}
eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id;
- eic->regs = ioremap(regs->start, re
gs->end - regs->start + 1
);
+ eic->regs = ioremap(regs->start, re
source_size(regs)
);
if (!eic->regs) {
dev_dbg(&pdev->dev, "failed to map regs\n");
goto err_ioremap;
if (!eic->regs) {
dev_dbg(&pdev->dev, "failed to map regs\n");
goto err_ioremap;