diff options
Diffstat (limited to 'drivers/scsi/sym53c8xx_2')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 7 | ||||
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 44169390c467..e053222a10a3 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -1288,7 +1288,7 @@ static int sym_host_info(struct sym_hcb *np, char *ptr, off_t offset, int len) | |||
1288 | "revision id 0x%x\n", | 1288 | "revision id 0x%x\n", |
1289 | np->s.chip_name, np->device_id, np->revision_id); | 1289 | np->s.chip_name, np->device_id, np->revision_id); |
1290 | copy_info(&info, "At PCI address %s, IRQ " IRQ_FMT "\n", | 1290 | copy_info(&info, "At PCI address %s, IRQ " IRQ_FMT "\n", |
1291 | pci_name(np->s.device), IRQ_PRM(np->s.irq)); | 1291 | pci_name(np->s.device), IRQ_PRM(np->s.device->irq)); |
1292 | copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n", | 1292 | copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n", |
1293 | (int) (np->minsync_dt ? np->minsync_dt : np->minsync), | 1293 | (int) (np->minsync_dt ? np->minsync_dt : np->minsync), |
1294 | np->maxwide ? "Wide" : "Narrow", | 1294 | np->maxwide ? "Wide" : "Narrow", |
@@ -1341,8 +1341,8 @@ static void sym_free_resources(struct sym_hcb *np, struct pci_dev *pdev) | |||
1341 | /* | 1341 | /* |
1342 | * Free O/S specific resources. | 1342 | * Free O/S specific resources. |
1343 | */ | 1343 | */ |
1344 | if (np->s.irq) | 1344 | if (pdev->irq) |
1345 | free_irq(np->s.irq, np); | 1345 | free_irq(pdev->irq, np); |
1346 | if (np->s.ioaddr) | 1346 | if (np->s.ioaddr) |
1347 | pci_iounmap(pdev, np->s.ioaddr); | 1347 | pci_iounmap(pdev, np->s.ioaddr); |
1348 | if (np->s.ramaddr) | 1348 | if (np->s.ramaddr) |
@@ -1491,7 +1491,6 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt, | |||
1491 | sym_name(np), pdev->irq); | 1491 | sym_name(np), pdev->irq); |
1492 | goto attach_failed; | 1492 | goto attach_failed; |
1493 | } | 1493 | } |
1494 | np->s.irq = pdev->irq; | ||
1495 | 1494 | ||
1496 | /* | 1495 | /* |
1497 | * After SCSI devices have been opened, we cannot | 1496 | * After SCSI devices have been opened, we cannot |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index 0f097ba4f712..bea7bcc69ebd 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h | |||
@@ -184,7 +184,6 @@ struct sym_shcb { | |||
184 | void __iomem * ioaddr; /* MMIO kernel io address */ | 184 | void __iomem * ioaddr; /* MMIO kernel io address */ |
185 | void __iomem * ramaddr; /* RAM kernel io address */ | 185 | void __iomem * ramaddr; /* RAM kernel io address */ |
186 | u_short io_ws; /* IO window size */ | 186 | u_short io_ws; /* IO window size */ |
187 | int irq; /* IRQ number */ | ||
188 | 187 | ||
189 | struct timer_list timer; /* Timer handler link header */ | 188 | struct timer_list timer; /* Timer handler link header */ |
190 | u_long lasttime; | 189 | u_long lasttime; |