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
74ea29c
..
71257e3
100644
(file)
--- a/
arch/arm/kernel/ecard.c
+++ b/
arch/arm/kernel/ecard.c
@@
-27,7
+27,6
@@
*/
#define ECARD_C
*/
#define ECARD_C
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-296,7
+295,7
@@
ecard_task(void * unused)
*/
static void ecard_call(struct ecard_request *req)
{
*/
static void ecard_call(struct ecard_request *req)
{
- DECLARE_COMPLETION(completion);
+ DECLARE_COMPLETION
_ONSTACK
(completion);
req->complete = &completion;
req->complete = &completion;
@@
-354,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,
@@
-471,7
+470,8
@@
static void ecard_irq_mask(unsigned int irqnr)
}
}
}
}
-static struct irqchip ecard_chip = {
+static struct irq_chip ecard_chip = {
+ .name = "ECARD",
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
@@
-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;
@@
-620,7
+620,7
@@
ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
ecard_t *ec = slot_to_ecard(slot);
if (ec->claimed) {
ecard_t *ec = slot_to_ecard(slot);
if (ec->claimed) {
- struct irq
desc *d = irq
desc + ec->irq;
+ struct irq
_desc *d = irq_
desc + ec->irq;
/*
* this ugly code is so that we can operate a
* prioritorising system:
/*
* this ugly code is so that we can operate a
* prioritorising system:
@@
-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);
@@
-807,14
+807,12
@@
static struct expansion_card *__init ecard_alloc_card(int type, int slot)
unsigned long base;
int i;
unsigned long base;
int i;
- ec = k
m
alloc(sizeof(ecard_t), GFP_KERNEL);
+ ec = k
z
alloc(sizeof(ecard_t), GFP_KERNEL);
if (!ec) {
ec = ERR_PTR(-ENOMEM);
goto nomem;
}
if (!ec) {
ec = ERR_PTR(-ENOMEM);
goto nomem;
}
- memset(ec, 0, sizeof(ecard_t));
-
ec->slot_no = slot;
ec->type = type;
ec->irq = NO_IRQ;
ec->slot_no = slot;
ec->type = type;
ec->irq = NO_IRQ;
@@
-886,7
+884,7
@@
static ssize_t ecard_show_resources(struct device *dev, struct device_attribute
int i;
for (i = 0; i < ECARD_NUM_RESOURCES; i++)
int i;
for (i = 0; i < ECARD_NUM_RESOURCES; i++)
- str += sprintf(str, "%08
lx %08l
x %08lx\n",
+ str += sprintf(str, "%08
x %08
x %08lx\n",
ec->resource[i].start,
ec->resource[i].end,
ec->resource[i].flags);
ec->resource[i].start,
ec->resource[i].end,
ec->resource[i].flags);
@@
-1024,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);
}