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]
/
drivers
/
atm
/
horizon.c
diff --git
a/drivers/atm/horizon.c
b/drivers/atm/horizon.c
index
821c81e
..
f96446c
100644
(file)
--- a/
drivers/atm/horizon.c
+++ b/
drivers/atm/horizon.c
@@
-1382,24
+1382,13
@@
static inline void rx_data_av_handler (hrz_dev * dev) {
/********** interrupt handler **********/
/********** interrupt handler **********/
-static irqreturn_t interrupt_handler(int irq, void *dev_id,
- struct pt_regs *pt_regs) {
+static irqreturn_t interrupt_handler(int irq, void *dev_id) {
hrz_dev * dev = (hrz_dev *) dev_id;
u32 int_source;
unsigned int irq_ok;
hrz_dev * dev = (hrz_dev *) dev_id;
u32 int_source;
unsigned int irq_ok;
- (void) pt_regs;
PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);
PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);
- if (!dev_id) {
- PRINTD (DBG_IRQ|DBG_ERR, "irq with NULL dev_id: %d", irq);
- return IRQ_NONE;
- }
- if (irq != dev->irq) {
- PRINTD (DBG_IRQ|DBG_ERR, "irq mismatch: %d", irq);
- return IRQ_NONE;
- }
-
// definitely for us
irq_ok = 0;
while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)
// definitely for us
irq_ok = 0;
while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)
@@
-1800,7
+1789,7
@@
static inline void CLOCK_IT (const hrz_dev *dev, u32 ctrl)
WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK);
}
WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK);
}
-static u16 __init read_bia (const hrz_dev * dev, u16 addr)
+static u16 __
dev
init read_bia (const hrz_dev * dev, u16 addr)
{
u32 ctrl = rd_regl (dev, CONTROL_0_REG);
{
u32 ctrl = rd_regl (dev, CONTROL_0_REG);
@@
-1856,7
+1845,7
@@
static u16 __init read_bia (const hrz_dev * dev, u16 addr)
/********** initialise a card **********/
/********** initialise a card **********/
-static int __init hrz_init (hrz_dev * dev) {
+static int __
dev
init hrz_init (hrz_dev * dev) {
int onefivefive;
u16 chan;
int onefivefive;
u16 chan;
@@
-2719,7
+2708,7
@@
static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
goto out_disable;
}
goto out_disable;
}
- dev = k
m
alloc(sizeof(hrz_dev), GFP_KERNEL);
+ dev = k
z
alloc(sizeof(hrz_dev), GFP_KERNEL);
if (!dev) {
// perhaps we should be nice: deregister all adapters and abort?
PRINTD(DBG_ERR, "out of memory");
if (!dev) {
// perhaps we should be nice: deregister all adapters and abort?
PRINTD(DBG_ERR, "out of memory");
@@
-2727,15
+2716,13
@@
static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
goto out_release;
}
goto out_release;
}
- memset(dev, 0, sizeof(hrz_dev));
-
pci_set_drvdata(pci_dev, dev);
// grab IRQ and install handler - move this someplace more sensible
irq = pci_dev->irq;
if (request_irq(irq,
interrupt_handler,
pci_set_drvdata(pci_dev, dev);
// grab IRQ and install handler - move this someplace more sensible
irq = pci_dev->irq;
if (request_irq(irq,
interrupt_handler,
-
SA_SHIRQ
, /* irqflags guess */
+
IRQF_SHARED
, /* irqflags guess */
DEV_LABEL, /* name guess */
dev)) {
PRINTD(DBG_WARN, "request IRQ failed!");
DEV_LABEL, /* name guess */
dev)) {
PRINTD(DBG_WARN, "request IRQ failed!");
@@
-2945,8
+2932,8
@@
static int __init hrz_module_init (void) {
static void __exit hrz_module_exit (void) {
PRINTD (DBG_FLOW, "cleanup_module");
static void __exit hrz_module_exit (void) {
PRINTD (DBG_FLOW, "cleanup_module");
-
-
return
pci_unregister_driver(&hrz_driver);
+
+ pci_unregister_driver(&hrz_driver);
}
module_init(hrz_module_init);
}
module_init(hrz_module_init);