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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_inline.h
diff --git
a/drivers/scsi/qla2xxx/qla_inline.h
b/drivers/scsi/qla2xxx/qla_inline.h
index
9bd7757
..
07c1133
100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_inline.h
+++ b/
drivers/scsi/qla2xxx/qla_inline.h
@@
-18,7
+18,7
@@
*/
*/
-static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t *);
+static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t
__iomem
*);
/*
* qla2x00_debounce_register
* Debounce register.
/*
* qla2x00_debounce_register
* Debounce register.
@@
-30,7
+30,7
@@
static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t *);
* register value.
*/
static __inline__ uint16_t
* register value.
*/
static __inline__ uint16_t
-qla2x00_debounce_register(volatile uint16_t *addr)
+qla2x00_debounce_register(volatile uint16_t
__iomem
*addr)
{
volatile uint16_t first;
volatile uint16_t second;
{
volatile uint16_t first;
volatile uint16_t second;
@@
-117,7
+117,10
@@
static __inline__ void qla2x00_poll(scsi_qla_host_t *);
static inline void
qla2x00_poll(scsi_qla_host_t *ha)
{
static inline void
qla2x00_poll(scsi_qla_host_t *ha)
{
- qla2x00_intr_handler(0, ha, NULL);
+ if (IS_QLA2100(ha) || IS_QLA2200(ha))
+ qla2100_intr_handler(0, ha, NULL);
+ else
+ qla2300_intr_handler(0, ha, NULL);
}
}
@@
-128,10
+131,9
@@
static inline void
qla2x00_enable_intrs(scsi_qla_host_t *ha)
{
unsigned long flags = 0;
qla2x00_enable_intrs(scsi_qla_host_t *ha)
{
unsigned long flags = 0;
- device_reg_t
*reg
;
+ device_reg_t
__iomem *reg = ha->iobase
;
spin_lock_irqsave(&ha->hardware_lock, flags);
spin_lock_irqsave(&ha->hardware_lock, flags);
- reg = ha->iobase;
ha->interrupts_on = 1;
/* enable risc and host interrupts */
WRT_REG_WORD(®->ictrl, ICR_EN_INT | ICR_EN_RISC);
ha->interrupts_on = 1;
/* enable risc and host interrupts */
WRT_REG_WORD(®->ictrl, ICR_EN_INT | ICR_EN_RISC);
@@
-144,10
+146,9
@@
static inline void
qla2x00_disable_intrs(scsi_qla_host_t *ha)
{
unsigned long flags = 0;
qla2x00_disable_intrs(scsi_qla_host_t *ha)
{
unsigned long flags = 0;
- device_reg_t
*reg
;
+ device_reg_t
__iomem *reg = ha->iobase
;
spin_lock_irqsave(&ha->hardware_lock, flags);
spin_lock_irqsave(&ha->hardware_lock, flags);
- reg = ha->iobase;
ha->interrupts_on = 0;
/* disable risc and host interrupts */
WRT_REG_WORD(®->ictrl, 0);
ha->interrupts_on = 0;
/* disable risc and host interrupts */
WRT_REG_WORD(®->ictrl, 0);