diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-10-05 15:55:12 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-23 15:23:28 -0400 |
| commit | 99c9e0a1d6cfe1ba1169a7a81435ee85bc00e4a1 (patch) | |
| tree | a946e291692f09e3b4ecc71ceb9dd264a9f7acea /drivers/scsi/sym53c8xx_2/sym_glue.h | |
| parent | 8022fbdacb0e9193a5dfb666479d1fc2ca63ecf1 (diff) | |
| download | op-kernel-dev-99c9e0a1d6cfe1ba1169a7a81435ee85bc00e4a1.zip op-kernel-dev-99c9e0a1d6cfe1ba1169a7a81435ee85bc00e4a1.tar.gz | |
[SCSI] sym53c8xx: Make interrupt handler capable of returning IRQ_NONE
Make sym_interrupt return an irqreturn_t instead of void, and take a
Scsi_Host instead of a sym_hcb. Pass the Scsi_Host to the interrupt
handler instead of the sym_hcb. Rename the host_data to sym_data.
Keep a pci_dev pointer in the sym_data. Rename the Scsi_Host from
instance to shost.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_glue.h')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index ab2de1c..98261a5 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -42,6 +42,7 @@ #include <linux/completion.h> #include <linux/delay.h> +#include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/pci.h> #include <linux/string.h> @@ -217,14 +218,15 @@ struct sym_device { /* * Driver host data structure. */ -struct host_data { +struct sym_data { struct sym_hcb *ncb; struct completion *io_reset; /* PCI error handling */ + struct pci_dev *pdev; }; static inline struct sym_hcb * sym_get_hcb(struct Scsi_Host *host) { - return ((struct host_data *)host->hostdata)->ncb; + return ((struct sym_data *)host->hostdata)->ncb; } #include "sym_fw.h" |
