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
/
parisc
/
eisa.c
diff --git
a/drivers/parisc/eisa.c
b/drivers/parisc/eisa.c
index
043d47a
..
e97cecb
100644
(file)
--- a/
drivers/parisc/eisa.c
+++ b/
drivers/parisc/eisa.c
@@
-57,7
+57,7
@@
static DEFINE_SPINLOCK(eisa_irq_lock);
static DEFINE_SPINLOCK(eisa_irq_lock);
-void __iomem *eisa_eeprom_addr;
+void __iomem *eisa_eeprom_addr
__read_mostly
;
/* We can only have one EISA adapter in the system because neither
* implementation can be flexed.
/* We can only have one EISA adapter in the system because neither
* implementation can be flexed.
@@
-141,7
+141,7
@@
static int slave_mask;
* in the furure.
*/
/* irq 13,8,2,1,0 must be edge */
* in the furure.
*/
/* irq 13,8,2,1,0 must be edge */
-static unsigned int eisa_irq_level; /* default to edge triggered */
+static unsigned int eisa_irq_level
__read_mostly
; /* default to edge triggered */
/* called by free irq */
/* called by free irq */
@@
-199,7
+199,7
@@
static struct hw_interrupt_type eisa_interrupt_type = {
.end = no_end_irq,
};
.end = no_end_irq,
};
-static irqreturn_t eisa_irq(int wax_irq, void *intr_dev
, struct pt_regs *regs
)
+static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
{
int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
unsigned long flags;
{
int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
unsigned long flags;
@@
-234,7
+234,7
@@
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev, struct pt_regs *regs)
}
spin_unlock_irqrestore(&eisa_irq_lock, flags);
}
spin_unlock_irqrestore(&eisa_irq_lock, flags);
- __do_IRQ(irq
, regs
);
+ __do_IRQ(irq);
spin_lock_irqsave(&eisa_irq_lock, flags);
/* unmask */
spin_lock_irqsave(&eisa_irq_lock, flags);
/* unmask */
@@
-249,7
+249,7
@@
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t dummy_irq2_handler(int _, void *dev
, struct pt_regs *regs
)
+static irqreturn_t dummy_irq2_handler(int _, void *dev)
{
printk(KERN_ALERT "eisa: uhh, irq2?\n");
return IRQ_HANDLED;
{
printk(KERN_ALERT "eisa: uhh, irq2?\n");
return IRQ_HANDLED;
@@
-315,7
+315,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
char *name = is_mongoose(dev) ? "Mongoose" : "Wax";
printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n",
char *name = is_mongoose(dev) ? "Mongoose" : "Wax";
printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n",
- name, dev->hpa);
+ name, dev->hpa
.start
);
eisa_dev.hba.dev = dev;
eisa_dev.hba.iommu = ccio_get_iommu(dev);
eisa_dev.hba.dev = dev;
eisa_dev.hba.iommu = ccio_get_iommu(dev);
@@
-340,7
+340,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
}
pcibios_register_hba(&eisa_dev.hba);
}
pcibios_register_hba(&eisa_dev.hba);
- result = request_irq(dev->irq, eisa_irq,
SA_SHIRQ
, "EISA", &eisa_dev);
+ result = request_irq(dev->irq, eisa_irq,
IRQF_SHARED
, "EISA", &eisa_dev);
if (result) {
printk(KERN_ERR "EISA: request_irq failed!\n");
return result;
if (result) {
printk(KERN_ERR "EISA: request_irq failed!\n");
return result;
@@
-350,7
+350,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
irq_desc[2].action = &irq2_action;
for (i = 0; i < 16; i++) {
irq_desc[2].action = &irq2_action;
for (i = 0; i < 16; i++) {
- irq_desc[i].
handler
= &eisa_interrupt_type;
+ irq_desc[i].
chip
= &eisa_interrupt_type;
}
EISA_bus = 1;
}
EISA_bus = 1;
@@
-366,7
+366,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
}
}
eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
}
}
- eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
+ eisa_eeprom_addr = ioremap
_nocache
(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,
&eisa_dev.hba.lmmio_space);
init_eisa_pic();
result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,
&eisa_dev.hba.lmmio_space);
init_eisa_pic();
@@
-397,7
+397,7
@@
static struct parisc_device_id eisa_tbl[] = {
MODULE_DEVICE_TABLE(parisc, eisa_tbl);
static struct parisc_driver eisa_driver = {
MODULE_DEVICE_TABLE(parisc, eisa_tbl);
static struct parisc_driver eisa_driver = {
- .name = "
EISA Bus Adapter
",
+ .name = "
eisa_ba
",
.id_table = eisa_tbl,
.probe = eisa_probe,
};
.id_table = eisa_tbl,
.probe = eisa_probe,
};