Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476834c2 authored by Jeff Garzik's avatar Jeff Garzik Committed by James Bottomley
Browse files

[SCSI] aacraid,qla2xxx: use irq_handler_t where appropriate 



Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatar"Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Acked-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 730a646d

drivers/scsi/aacraid/aacraid.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -464,7 +464,7 @@ struct adapter_ops 
	int  (*adapter_restart)(struct aac_dev *dev, int bled);

	int  (*adapter_restart)(struct aac_dev *dev, int bled);

	/* Transport operations */

	/* Transport operations */

	int  (*adapter_ioremap)(struct aac_dev * dev, u32 size);

	int  (*adapter_ioremap)(struct aac_dev * dev, u32 size);

	irqreturn_t (*adapter_intr)(int irq, void *dev_id);

	irq_handler_t adapter_intr;

	/* Packet operations */

	/* Packet operations */

	int  (*adapter_deliver)(struct fib * fib);

	int  (*adapter_deliver)(struct fib * fib);

	int  (*adapter_bounds)(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba);

	int  (*adapter_bounds)(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba);

drivers/scsi/qla2xxx/qla_isr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1633,7 +1633,7 @@ struct qla_init_msix_entry { 
	uint16_t entry;

	uint16_t entry;

	uint16_t index;

	uint16_t index;

	const char *name;

	const char *name;

	irqreturn_t (*handler)(int, void *);

	irq_handler_t handler;

};

};





static struct qla_init_msix_entry imsix_entries[QLA_MSIX_ENTRIES] = {

static struct qla_init_msix_entry imsix_entries[QLA_MSIX_ENTRIES] = {