git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
ecard.c
diff --git
a/arch/arm/kernel/ecard.c
b/arch/arm/kernel/ecard.c
index
3e14b13
..
71257e3
100644
(file)
--- a/
arch/arm/kernel/ecard.c
+++ b/
arch/arm/kernel/ecard.c
@@
-353,7
+353,7
@@
int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
}
if (c_id(&excd) == 0x80) { /* loader */
if (!ec->loader) {
}
if (c_id(&excd) == 0x80) { /* loader */
if (!ec->loader) {
- ec->loader =
(loader_t)
kmalloc(c_len(&excd),
+ ec->loader = kmalloc(c_len(&excd),
GFP_KERNEL);
if (ec->loader)
ecard_readbytes(ec->loader, ec,
GFP_KERNEL);
if (ec->loader)
ecard_readbytes(ec->loader, ec,
@@
-529,7
+529,7
@@
static void ecard_dump_irq_state(void)
}
}
}
}
-static void ecard_check_lockup(struct irqdesc *desc)
+static void ecard_check_lockup(struct irq
_
desc *desc)
{
static unsigned long last;
static int lockup;
{
static unsigned long last;
static int lockup;
@@
-567,7
+567,7
@@
static void ecard_check_lockup(struct irqdesc *desc)
}
static void
}
static void
-ecard_irq_handler(unsigned int irq, struct irq
desc *desc, struct pt_regs *regs
)
+ecard_irq_handler(unsigned int irq, struct irq
_desc *desc
)
{
ecard_t *ec;
int called = 0;
{
ecard_t *ec;
int called = 0;
@@
-585,8
+585,8
@@
ecard_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
pending = ecard_default_ops.irqpending(ec);
if (pending) {
pending = ecard_default_ops.irqpending(ec);
if (pending) {
- struct irqdesc *d = irq_desc + ec->irq;
- desc_handle_irq(ec->irq, d
, regs
);
+ struct irq
_
desc *d = irq_desc + ec->irq;
+ desc_handle_irq(ec->irq, d);
called ++;
}
}
called ++;
}
}
@@
-609,7
+609,7
@@
static unsigned char first_set[] =
};
static void
};
static void
-ecard_irqexp_handler(unsigned int irq, struct irq
desc *desc, struct pt_regs *regs
)
+ecard_irqexp_handler(unsigned int irq, struct irq
_desc *desc
)
{
const unsigned int statusmask = 15;
unsigned int status;
{
const unsigned int statusmask = 15;
unsigned int status;
@@
-633,7
+633,7
@@
ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
* Serial cards should go in 0/1, ethernet/scsi in 2/3
* otherwise you will lose serial data at high speeds!
*/
* Serial cards should go in 0/1, ethernet/scsi in 2/3
* otherwise you will lose serial data at high speeds!
*/
- desc_handle_irq(ec->irq, d
, regs
);
+ desc_handle_irq(ec->irq, d);
} else {
printk(KERN_WARNING "card%d: interrupt from unclaimed "
"card???\n", slot);
} else {
printk(KERN_WARNING "card%d: interrupt from unclaimed "
"card???\n", slot);
@@
-1022,7
+1022,7
@@
ecard_probe(int slot, card_type_t type)
if (slot < 8) {
ec->irq = 32 + slot;
set_irq_chip(ec->irq, &ecard_chip);
if (slot < 8) {
ec->irq = 32 + slot;
set_irq_chip(ec->irq, &ecard_chip);
- set_irq_handler(ec->irq,
do_level_IRQ
);
+ set_irq_handler(ec->irq,
handle_level_irq
);
set_irq_flags(ec->irq, IRQF_VALID);
}
set_irq_flags(ec->irq, IRQF_VALID);
}