diff options
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index c45725e9224f..a3138ee91050 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -464,7 +464,7 @@ struct adapter_ops | |||
464 | int (*adapter_restart)(struct aac_dev *dev, int bled); | 464 | int (*adapter_restart)(struct aac_dev *dev, int bled); |
465 | /* Transport operations */ | 465 | /* Transport operations */ |
466 | int (*adapter_ioremap)(struct aac_dev * dev, u32 size); | 466 | int (*adapter_ioremap)(struct aac_dev * dev, u32 size); |
467 | irqreturn_t (*adapter_intr)(int irq, void *dev_id); | 467 | irq_handler_t adapter_intr; |
468 | /* Packet operations */ | 468 | /* Packet operations */ |
469 | int (*adapter_deliver)(struct fib * fib); | 469 | int (*adapter_deliver)(struct fib * fib); |
470 | int (*adapter_bounds)(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba); | 470 | int (*adapter_bounds)(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba); |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index ca463469063d..0f04258becbf 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -1633,7 +1633,7 @@ struct qla_init_msix_entry { | |||
1633 | uint16_t entry; | 1633 | uint16_t entry; |
1634 | uint16_t index; | 1634 | uint16_t index; |
1635 | const char *name; | 1635 | const char *name; |
1636 | irqreturn_t (*handler)(int, void *); | 1636 | irq_handler_t handler; |
1637 | }; | 1637 | }; |
1638 | 1638 | ||
1639 | static struct qla_init_msix_entry imsix_entries[QLA_MSIX_ENTRIES] = { | 1639 | static struct qla_init_msix_entry imsix_entries[QLA_MSIX_ENTRIES] = { |