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 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
pcmcia
/
vrc4173_cardu.c
diff --git
a/drivers/pcmcia/vrc4173_cardu.c
b/drivers/pcmcia/vrc4173_cardu.c
index
57f38db
..
9b3c158
100644
(file)
--- a/
drivers/pcmcia/vrc4173_cardu.c
+++ b/
drivers/pcmcia/vrc4173_cardu.c
@@
-6,7
+6,7
@@
* NEC VRC4173 CARDU driver for Socket Services
* (This device doesn't support CardBus. it is supporting only 16bit PC Card.)
*
* NEC VRC4173 CARDU driver for Socket Services
* (This device doesn't support CardBus. it is supporting only 16bit PC Card.)
*
- * Copyright 2002,2003 Yoichi Yuasa <y
oichi_yuasa@tripeaks.co.jp
>
+ * Copyright 2002,2003 Yoichi Yuasa <y
uasa@linux-mips.org
>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-41,7
+41,7
@@
#include "vrc4173_cardu.h"
MODULE_DESCRIPTION("NEC VRC4173 CARDU driver for Socket Services");
#include "vrc4173_cardu.h"
MODULE_DESCRIPTION("NEC VRC4173 CARDU driver for Socket Services");
-MODULE_AUTHOR("Yoichi Yuasa <y
oichi_yuasa@tripeaks.co.jp
>");
+MODULE_AUTHOR("Yoichi Yuasa <y
uasa@linux-mips.org
>");
MODULE_LICENSE("GPL");
static int vrc4173_cardu_slots;
MODULE_LICENSE("GPL");
static int vrc4173_cardu_slots;
@@
-440,7
+440,7
@@
static uint16_t get_events(vrc4173_socket_t *socket)
return events;
}
return events;
}
-static void cardu_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static void cardu_interrupt(int irq, void *dev_id)
{
vrc4173_socket_t *socket = (vrc4173_socket_t *)dev_id;
uint16_t events;
{
vrc4173_socket_t *socket = (vrc4173_socket_t *)dev_id;
uint16_t events;
@@
-500,7
+500,7
@@
static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,
return -ENOMEM;
}
return -ENOMEM;
}
- if (request_irq(dev->irq, cardu_interrupt,
SA_SHIRQ
, socket->name, socket) < 0) {
+ if (request_irq(dev->irq, cardu_interrupt,
IRQF_SHARED
, socket->name, socket) < 0) {
pcmcia_unregister_socket(socket->pcmcia_socket);
socket->pcmcia_socket = NULL;
iounmap(socket->base);
pcmcia_unregister_socket(socket->pcmcia_socket);
socket->pcmcia_socket = NULL;
iounmap(socket->base);
@@
-516,7
+516,7
@@
static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,
static int __devinit vrc4173_cardu_setup(char *options)
{
if (options == NULL || *options == '\0')
static int __devinit vrc4173_cardu_setup(char *options)
{
if (options == NULL || *options == '\0')
- return
0
;
+ return
1
;
if (strncmp(options, "cardu1:", 7) == 0) {
options += 7;
if (strncmp(options, "cardu1:", 7) == 0) {
options += 7;
@@
-527,9
+527,9
@@
static int __devinit vrc4173_cardu_setup(char *options)
}
if (*options != ',')
}
if (*options != ',')
- return
0
;
+ return
1
;
} else
} else
- return
0
;
+ return
1
;
}
if (strncmp(options, "cardu2:", 7) == 0) {
}
if (strncmp(options, "cardu2:", 7) == 0) {
@@
-538,7
+538,7
@@
static int __devinit vrc4173_cardu_setup(char *options)
cardu_sockets[CARDU2].noprobe = 1;
}
cardu_sockets[CARDU2].noprobe = 1;
}
- return
0
;
+ return
1
;
}
__setup("vrc4173_cardu=", vrc4173_cardu_setup);
}
__setup("vrc4173_cardu=", vrc4173_cardu_setup);