git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Integrator: convert to generic clockevent support
[safe/jmp/linux-2.6]
/
drivers
/
mfd
/
htc-egpio.c
diff --git
a/drivers/mfd/htc-egpio.c
b/drivers/mfd/htc-egpio.c
index
8872cc0
..
addb846
100644
(file)
--- a/
drivers/mfd/htc-egpio.c
+++ b/
drivers/mfd/htc-egpio.c
@@
-108,11
+108,11
@@
static void egpio_handler(unsigned int irq, struct irq_desc *desc)
ack_irqs(ei);
/* Process all set pins. */
readval &= ei->irqs_enabled;
ack_irqs(ei);
/* Process all set pins. */
readval &= ei->irqs_enabled;
- for_each_bit(irqpin, &readval, ei->nirqs) {
+ for_each_
set_
bit(irqpin, &readval, ei->nirqs) {
/* Run irq handler */
pr_debug("got IRQ %d\n", irqpin);
irq = ei->irq_start + irqpin;
/* Run irq handler */
pr_debug("got IRQ %d\n", irqpin);
irq = ei->irq_start + irqpin;
- desc =
&irq_desc[irq]
;
+ desc =
irq_to_desc(irq)
;
desc->handle_irq(irq, desc);
}
}
desc->handle_irq(irq, desc);
}
}
@@
-286,10
+286,10
@@
static int __init egpio_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
goto fail;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
goto fail;
- ei->base_addr = ioremap_nocache(res->start, res
->end - res->start
);
+ ei->base_addr = ioremap_nocache(res->start, res
ource_size(res)
);
if (!ei->base_addr)
goto fail;
if (!ei->base_addr)
goto fail;
- pr_debug("EGPIO phys=%08x virt=%p\n", res->start, ei->base_addr);
+ pr_debug("EGPIO phys=%08x virt=%p\n",
(u32)
res->start, ei->base_addr);
if ((pdata->bus_width != 16) && (pdata->bus_width != 32))
goto fail;
if ((pdata->bus_width != 16) && (pdata->bus_width != 32))
goto fail;
@@
-307,7
+307,7
@@
static int __init egpio_probe(struct platform_device *pdev)
ei->nchips = pdata->num_chips;
ei->chip = kzalloc(sizeof(struct egpio_chip) * ei->nchips, GFP_KERNEL);
ei->nchips = pdata->num_chips;
ei->chip = kzalloc(sizeof(struct egpio_chip) * ei->nchips, GFP_KERNEL);
- if (!ei) {
+ if (!ei
->chip
) {
ret = -ENOMEM;
goto fail;
}
ret = -ENOMEM;
goto fail;
}
@@
-318,6
+318,8
@@
static int __init egpio_probe(struct platform_device *pdev)
ei->chip[i].dev = &(pdev->dev);
chip = &(ei->chip[i].chip);
chip->label = "htc-egpio";
ei->chip[i].dev = &(pdev->dev);
chip = &(ei->chip[i].chip);
chip->label = "htc-egpio";
+ chip->dev = &pdev->dev;
+ chip->owner = THIS_MODULE;
chip->get = egpio_get;
chip->set = egpio_set;
chip->direction_input = egpio_direction_input;
chip->get = egpio_get;
chip->set = egpio_set;
chip->direction_input = egpio_direction_input;