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
/
mach-ixp2000
/
ixdp2x00.c
diff --git
a/arch/arm/mach-ixp2000/ixdp2x00.c
b/arch/arm/mach-ixp2000/ixdp2x00.c
index
d628da5
..
52b368b
100644
(file)
--- a/
arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/
arch/arm/mach-ixp2000/ixdp2x00.c
@@
-14,7
+14,6
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
@@
-107,7
+106,7
@@
static void ixdp2x00_irq_unmask(unsigned int irq)
ixp2000_release_slowport(&old_cfg);
}
ixp2000_release_slowport(&old_cfg);
}
-static void ixdp2x00_irq_handler(unsigned int irq, struct irq
desc *desc, struct pt_regs *regs
)
+static void ixdp2x00_irq_handler(unsigned int irq, struct irq
_desc *desc
)
{
volatile u32 ex_interrupt = 0;
static struct slowport_cfg old_cfg;
{
volatile u32 ex_interrupt = 0;
static struct slowport_cfg old_cfg;
@@
-130,17
+129,17
@@
static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc, struct
for(i = 0; i < board_irq_count; i++) {
if(ex_interrupt & (1 << i)) {
for(i = 0; i < board_irq_count; i++) {
if(ex_interrupt & (1 << i)) {
- struct irqdesc *cpld_desc;
+ struct irq
_
desc *cpld_desc;
int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
cpld_desc = irq_desc + cpld_irq;
int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
cpld_desc = irq_desc + cpld_irq;
- desc_handle_irq(cpld_irq, cpld_desc
, regs
);
+ desc_handle_irq(cpld_irq, cpld_desc);
}
}
desc->chip->unmask(irq);
}
}
}
desc->chip->unmask(irq);
}
-static struct irqchip ixdp2x00_cpld_irq_chip = {
+static struct irq
_
chip ixdp2x00_cpld_irq_chip = {
.ack = ixdp2x00_irq_mask,
.mask = ixdp2x00_irq_mask,
.unmask = ixdp2x00_irq_unmask
.ack = ixdp2x00_irq_mask,
.mask = ixdp2x00_irq_mask,
.unmask = ixdp2x00_irq_unmask
@@
-163,12
+162,12
@@
void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long
for(irq = IXP2000_BOARD_IRQ(0); irq < IXP2000_BOARD_IRQ(board_irq_count); irq++) {
set_irq_chip(irq, &ixdp2x00_cpld_irq_chip);
for(irq = IXP2000_BOARD_IRQ(0); irq < IXP2000_BOARD_IRQ(board_irq_count); irq++) {
set_irq_chip(irq, &ixdp2x00_cpld_irq_chip);
- set_irq_handler(irq,
do_level_IRQ
);
+ set_irq_handler(irq,
handle_level_irq
);
set_irq_flags(irq, IRQF_VALID);
}
/* Hook into PCI interrupt */
set_irq_flags(irq, IRQF_VALID);
}
/* Hook into PCI interrupt */
- set_irq_chained_handler(IRQ_IXP2000_PCIB,
&
ixdp2x00_irq_handler);
+ set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);
}
/*************************************************************************
}
/*************************************************************************
@@
-242,11
+241,14
@@
void ixdp2x00_slave_pci_postinit(void)
/*
* Remove PMC device is there is one
*/
/*
* Remove PMC device is there is one
*/
- if((dev = pci_
find_slot(1, IXDP2X00_PMC_DEVFN)))
+ if((dev = pci_
get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
+ }
- dev = pci_
fi
nd_slot(0, IXDP2X00_21555_DEVFN);
+ dev = pci_
get_bus_a
nd_slot(0, IXDP2X00_21555_DEVFN);
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
}
/**************************************************************************
}
/**************************************************************************