Skip to content

L
linux
Commit 26281b14 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files
Options

[PATCH] fix up ini9100 interrupt handling 

Currently is has a different irq handler for every "supported" chip.
Make use of the private data passed to request_irq instead.
parent 4f68a773
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 174 deletions
drivers/scsi/ini9100u.c
View file @ 26281b14
......@@ -272,6 +272,17 @@ static Scsi_Cmnd *i91uPopSRBFromQueue(HCS * pHCB)
return (pSRB);
}
static irqreturn_t i91u_intr(int irqno, void *dev_id, struct pt_regs *regs)
{
struct Scsi_Host *dev = dev_id;
unsigned long flags;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr((HCS *)hreg->base);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
/* called from init/main.c */
void i91u_setup(char *str, int *ints)
......@@ -396,8 +407,7 @@ int i91u_detect(Scsi_Host_Template * tpnt)
pHCB->HCS_Index = i; /* 7/29/98 */
hreg = scsi_register(tpnt, sizeof(HCS));
if(hreg == NULL)
{
if(hreg == NULL) {
release_region(pHCB->HCS_Base, 256);
return 0;
}
......@@ -413,48 +423,10 @@ int i91u_detect(Scsi_Host_Template * tpnt)
hreg->sg_tablesize = TOTAL_SG_ENTRY; /* Maximun support is 32 */
/* Initial tulip chip */
switch (i) {
case 0:
ok = request_irq(pHCB->HCS_Intr, i91u_intr0, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 1:
ok = request_irq(pHCB->HCS_Intr, i91u_intr1, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 2:
ok = request_irq(pHCB->HCS_Intr, i91u_intr2, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 3:
ok = request_irq(pHCB->HCS_Intr, i91u_intr3, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 4:
ok = request_irq(pHCB->HCS_Intr, i91u_intr4, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 5:
ok = request_irq(pHCB->HCS_Intr, i91u_intr5, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 6:
ok = request_irq(pHCB->HCS_Intr, i91u_intr6, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
case 7:
ok = request_irq(pHCB->HCS_Intr, i91u_intr7, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
break;
default:
i91u_panic("i91u: Too many host adapters\n");
break;
}
ok = request_irq(pHCB->HCS_Intr, i91u_intr, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);
if (ok < 0) {
if (ok == -EINVAL) {
printk("i91u: bad IRQ %d.\n", pHCB->HCS_Intr);
printk(" Contact author.\n");
} else if (ok == -EBUSY)
printk("i91u: IRQ %d already in use. Configure another.\n",
pHCB->HCS_Intr);
else {
printk("\ni91u: Unexpected error code on requesting IRQ %d.\n",
pHCB->HCS_Intr);
printk(" Contact author.\n");
}
i91u_panic("i91u: driver needs an IRQ.\n");
printk(KERN_WARNING "i91u: unable to request IRQ %d\n\n", pHCB->HCS_Intr);
return 0;
}
}
......@@ -731,137 +703,6 @@ static void i91uSCBPost(BYTE * pHcb, BYTE * pScb)
return;
}
/*
* Interrupts handler (main routine of the driver)
*/
static irqreturn_t i91u_intr0(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[0].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[0]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr1(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[1].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[1]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr2(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[2].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[2]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr3(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[3].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[3]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr4(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[4].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[4]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr5(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[5].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[5]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr6(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[6].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[6]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
static irqreturn_t i91u_intr7(int irqno, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
struct Scsi_Host *dev = dev_id;
if (tul_hcs[7].HCS_Intr != irqno)
return IRQ_NONE;
spin_lock_irqsave(dev->host_lock, flags);
tul_isr(&tul_hcs[7]);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
/*
* Dump the current driver status and panic...
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7