Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCSI] sym53c8xx: Use pci_dev irq number

Browse Source 
Don't cache a private copy of the interrupt number

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Matthew Wilcox 2007-10-05 15:54:59 -04:00 committed by James Bottomley
parent 34996acc55
commit f363abff55
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/sym53c8xx_2/sym_glue.c
View File

@ -1288,7 +1288,7 @@ static int sym_host_info(struct sym_hcb *np, char *ptr, off_t offset, int len)
"revision id 0x%x\n", "revision id 0x%x\n",
np->s.chip_name, np->device_id, np->revision_id); np->s.chip_name, np->device_id, np->revision_id);
copy_info(&info, "At PCI address %s, IRQ " IRQ_FMT "\n", copy_info(&info, "At PCI address %s, IRQ " IRQ_FMT "\n",
pci_name(np->s.device), IRQ_PRM(np->s.irq)); pci_name(np->s.device), IRQ_PRM(np->s.device->irq));
copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n", copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n",
(int) (np->minsync_dt ? np->minsync_dt : np->minsync), (int) (np->minsync_dt ? np->minsync_dt : np->minsync),
np->maxwide ? "Wide" : "Narrow", np->maxwide ? "Wide" : "Narrow",
@ -1341,8 +1341,8 @@ static void sym_free_resources(struct sym_hcb *np, struct pci_dev *pdev)
/* /*
* Free O/S specific resources. * Free O/S specific resources.
*/ */
if (np->s.irq) if (pdev->irq)
free_irq(np->s.irq, np); free_irq(pdev->irq, np);
if (np->s.ioaddr) if (np->s.ioaddr)
pci_iounmap(pdev, np->s.ioaddr); pci_iounmap(pdev, np->s.ioaddr);
if (np->s.ramaddr) if (np->s.ramaddr)
@ -1491,7 +1491,6 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
sym_name(np), pdev->irq); sym_name(np), pdev->irq);
goto attach_failed; goto attach_failed;
} }
np->s.irq = pdev->irq;
/* /*
* After SCSI devices have been opened, we cannot * After SCSI devices have been opened, we cannot

1
drivers/scsi/sym53c8xx_2/sym_glue.h
View File

@ -184,7 +184,6 @@ struct sym_shcb {
void __iomem * ioaddr; /* MMIO kernel io address */ void __iomem * ioaddr; /* MMIO kernel io address */
void __iomem * ramaddr; /* RAM kernel io address */ void __iomem * ramaddr; /* RAM kernel io address */
u_short io_ws; /* IO window size */ u_short io_ws; /* IO window size */
int irq; /* IRQ number */
struct timer_list timer; /* Timer handler link header */ struct timer_list timer; /* Timer handler link header */
u_long lasttime; u_long lasttime;