AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

Browse Source 
* 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/isdn/act2000: kill irq2card_map
  drivers/net/eepro: kill dead code
  Various drivers' irq handlers: kill dead code, needless casts
  drivers/net: eliminate irq handler impossible checks, needless casts
  arch/i386/kernel/time: don't shadow 'irq' function arg
This commit is contained in:
Linus Torvalds 2006-10-09 14:21:45 -07:00
commit 5a43c09d1b
74 changed files with 106 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/i386/kernel/time.c
View File

@ -201,8 +201,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
high bit of the PPI port B (0x61). Note that some PS/2s, high bit of the PPI port B (0x61). Note that some PS/2s,
notably the 55SX, work fine if this is removed. */ notably the 55SX, work fine if this is removed. */
irq = inb_p( 0x61 ); /* read the current state */ u8 irq_v = inb_p( 0x61 ); /* read the current state */
outb_p( irq|0x80, 0x61 ); /* reset the IRQ */ outb_p( irq_v|0x80, 0x61 ); /* reset the IRQ */
} }
write_sequnlock(&xtime_lock); write_sequnlock(&xtime_lock);

7
drivers/atm/ambassador.c
View File

@ -862,15 +862,10 @@ static inline void interrupts_off (amb_dev * dev) {
/********** interrupt handling **********/ /********** interrupt handling **********/
static irqreturn_t interrupt_handler(int irq, void *dev_id) { static irqreturn_t interrupt_handler(int irq, void *dev_id) {
amb_dev * dev = (amb_dev *) dev_id; amb_dev * dev = dev_id;
PRINTD (DBG_IRQ|DBG_FLOW, "interrupt_handler: %p", dev_id); PRINTD (DBG_IRQ|DBG_FLOW, "interrupt_handler: %p", dev_id);
if (!dev_id) {
PRINTD (DBG_IRQ|DBG_ERR, "irq with NULL dev_id: %d", irq);
return IRQ_NONE;
}
{ {
u32 interrupt = rd_plain (dev, offsetof(amb_mem, interrupt)); u32 interrupt = rd_plain (dev, offsetof(amb_mem, interrupt));

9
drivers/atm/horizon.c
View File

@ -1389,15 +1389,6 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) {
PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id); PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);
if (!dev_id) {
PRINTD (DBG_IRQ|DBG_ERR, "irq with NULL dev_id: %d", irq);
return IRQ_NONE;
}
if (irq != dev->irq) {
PRINTD (DBG_IRQ|DBG_ERR, "irq mismatch: %d", irq);
return IRQ_NONE;
}
// definitely for us // definitely for us
irq_ok = 0; irq_ok = 0;
while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF) while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)

4
drivers/atm/lanai.c
View File

@ -1892,11 +1892,9 @@ static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)
static irqreturn_t lanai_int(int irq, void *devid) static irqreturn_t lanai_int(int irq, void *devid)
{ {
struct lanai_dev *lanai = (struct lanai_dev *) devid; struct lanai_dev *lanai = devid;
u32 reason; u32 reason;
(void) irq; /* unused variables */
#ifdef USE_POWERDOWN #ifdef USE_POWERDOWN
/* /*
* If we're powered down we shouldn't be generating any interrupts - * If we're powered down we shouldn't be generating any interrupts -

14
drivers/block/DAC960.c
View File

@ -5254,7 +5254,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_StatusMailbox_T *NextStatusMailbox; DAC960_V2_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
@ -5295,7 +5295,7 @@ static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_StatusMailbox_T *NextStatusMailbox; DAC960_V2_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
@ -5337,7 +5337,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_StatusMailbox_T *NextStatusMailbox; DAC960_V2_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
@ -5379,7 +5379,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_StatusMailbox_T *NextStatusMailbox; DAC960_V1_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
@ -5417,7 +5417,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_StatusMailbox_T *NextStatusMailbox; DAC960_V1_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
@ -5455,7 +5455,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
unsigned long flags; unsigned long flags;
@ -5493,7 +5493,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel, static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel,
void *DeviceIdentifier) void *DeviceIdentifier)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = DeviceIdentifier;
void __iomem *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
unsigned long flags; unsigned long flags;

4
drivers/cdrom/mcdx.c
View File

@ -850,10 +850,6 @@ static irqreturn_t mcdx_intr(int irq, void *dev_id)
struct s_drive_stuff *stuffp = dev_id; struct s_drive_stuff *stuffp = dev_id;
unsigned char b; unsigned char b;
if (stuffp == NULL) {
xwarn("mcdx: no device for intr %d\n", irq);
return IRQ_NONE;
}
#ifdef AK2 #ifdef AK2
if (!stuffp->busy && stuffp->pending) if (!stuffp->busy && stuffp->pending)
stuffp->int_err = 1; stuffp->int_err = 1;

2
drivers/char/rio/func.h
View File

@ -88,7 +88,7 @@ void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int);
/* riointr.c */ /* riointr.c */
void RIOTxEnable(char *); void RIOTxEnable(char *);
void RIOServiceHost(struct rio_info *, struct Host *, int); void RIOServiceHost(struct rio_info *, struct Host *);
int riotproc(struct rio_info *, struct ttystatics *, int, int); int riotproc(struct rio_info *, struct ttystatics *, int, int);
/* rioparam.c */ /* rioparam.c */

4
drivers/char/rio/rio_linux.c
View File

@ -368,7 +368,7 @@ static irqreturn_t rio_interrupt(int irq, void *ptr)
struct Host *HostP; struct Host *HostP;
func_enter(); func_enter();
HostP = (struct Host *) ptr; /* &p->RIOHosts[(long)ptr]; */ HostP = ptr; /* &p->RIOHosts[(long)ptr]; */
rio_dprintk(RIO_DEBUG_IFLOW, "rio: enter rio_interrupt (%d/%d)\n", irq, HostP->Ivec); rio_dprintk(RIO_DEBUG_IFLOW, "rio: enter rio_interrupt (%d/%d)\n", irq, HostP->Ivec);
/* AAargh! The order in which to do these things is essential and /* AAargh! The order in which to do these things is essential and
@ -402,7 +402,7 @@ static irqreturn_t rio_interrupt(int irq, void *ptr)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
RIOServiceHost(p, HostP, irq); RIOServiceHost(p, HostP);
rio_dprintk(RIO_DEBUG_IFLOW, "riointr() doing host %p type %d\n", ptr, HostP->Type); rio_dprintk(RIO_DEBUG_IFLOW, "riointr() doing host %p type %d\n", ptr, HostP->Type);

2
drivers/char/rio/riointr.c
View File

@ -181,7 +181,7 @@ static int RupIntr;
static int RxIntr; static int RxIntr;
static int TxIntr; static int TxIntr;
void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) void RIOServiceHost(struct rio_info *p, struct Host *HostP)
{ {
rio_spin_lock(&HostP->HostLock); rio_spin_lock(&HostP->HostLock);
if ((HostP->Flags & RUN_STATE) != RC_RUNNING) { if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {

7
drivers/char/riscom8.c
View File

@ -559,11 +559,10 @@ static irqreturn_t rc_interrupt(int irq, void * dev_id)
int handled = 0; int handled = 0;
bp = IRQ_to_board[irq]; bp = IRQ_to_board[irq];
if (!bp || !(bp->flags & RC_BOARD_ACTIVE)) { if (!(bp->flags & RC_BOARD_ACTIVE))
return IRQ_NONE; return IRQ_NONE;
}
while ((++loop < 16) && ((status = ~(rc_in(bp, RC_BSR))) & while ((++loop < 16) && ((status = ~(rc_in(bp, RC_BSR))) &
(RC_BSR_TOUT | RC_BSR_TINT | (RC_BSR_TOUT | RC_BSR_TINT |
RC_BSR_MINT | RC_BSR_RINT))) { RC_BSR_MINT | RC_BSR_RINT))) {

2
drivers/char/specialix.c
View File

@ -912,7 +912,7 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id)
spin_lock_irqsave(&bp->lock, flags); spin_lock_irqsave(&bp->lock, flags);
dprintk (SX_DEBUG_FLOW, "enter %s port %d room: %ld\n", __FUNCTION__, port_No(sx_get_port(bp, "INT")), SERIAL_XMIT_SIZE - sx_get_port(bp, "ITN")->xmit_cnt - 1); dprintk (SX_DEBUG_FLOW, "enter %s port %d room: %ld\n", __FUNCTION__, port_No(sx_get_port(bp, "INT")), SERIAL_XMIT_SIZE - sx_get_port(bp, "ITN")->xmit_cnt - 1);
if (!bp || !(bp->flags & SX_BOARD_ACTIVE)) { if (!(bp->flags & SX_BOARD_ACTIVE)) {
dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", irq); dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", irq);
spin_unlock_irqrestore(&bp->lock, flags); spin_unlock_irqrestore(&bp->lock, flags);
func_exit(); func_exit();

22
drivers/isdn/act2000/act2000_isa.c
View File

@ -16,8 +16,6 @@
#include "act2000_isa.h" #include "act2000_isa.h"
#include "capi.h" #include "capi.h"
static act2000_card *irq2card_map[16];
/* /*
* Reset Controller, then try to read the Card's signature. * Reset Controller, then try to read the Card's signature.
+ Return: + Return:
@ -65,14 +63,9 @@ act2000_isa_detect(unsigned short portbase)
static irqreturn_t static irqreturn_t
act2000_isa_interrupt(int irq, void *dev_id) act2000_isa_interrupt(int irq, void *dev_id)
{ {
act2000_card *card = irq2card_map[irq]; act2000_card *card = dev_id;
u_char istatus; u_char istatus;
if (!card) {
printk(KERN_WARNING
"act2000: Spurious interrupt!\n");
return IRQ_NONE;
}
istatus = (inb(ISA_PORT_ISR) & 0x07); istatus = (inb(ISA_PORT_ISR) & 0x07);
if (istatus & ISA_ISR_OUT) { if (istatus & ISA_ISR_OUT) {
/* RX fifo has data */ /* RX fifo has data */
@ -139,17 +132,15 @@ int
act2000_isa_config_irq(act2000_card * card, short irq) act2000_isa_config_irq(act2000_card * card, short irq)
{ {
if (card->flags & ACT2000_FLAGS_IVALID) { if (card->flags & ACT2000_FLAGS_IVALID) {
free_irq(card->irq, NULL); free_irq(card->irq, card);
irq2card_map[card->irq] = NULL;
} }
card->flags &= ~ACT2000_FLAGS_IVALID; card->flags &= ~ACT2000_FLAGS_IVALID;
outb(ISA_COR_IRQOFF, ISA_PORT_COR); outb(ISA_COR_IRQOFF, ISA_PORT_COR);
if (!irq) if (!irq)
return 0; return 0;
if (!request_irq(irq, &act2000_isa_interrupt, 0, card->regname, NULL)) { if (!request_irq(irq, &act2000_isa_interrupt, 0, card->regname, card)) {
card->irq = irq; card->irq = irq;
irq2card_map[card->irq] = card;
card->flags |= ACT2000_FLAGS_IVALID; card->flags |= ACT2000_FLAGS_IVALID;
printk(KERN_WARNING printk(KERN_WARNING
"act2000: Could not request irq %d\n",irq); "act2000: Could not request irq %d\n",irq);
@ -188,10 +179,9 @@ act2000_isa_release(act2000_card * card)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&card->lock, flags); spin_lock_irqsave(&card->lock, flags);
if (card->flags & ACT2000_FLAGS_IVALID) { if (card->flags & ACT2000_FLAGS_IVALID)
free_irq(card->irq, NULL); free_irq(card->irq, card);
irq2card_map[card->irq] = NULL;
}
card->flags &= ~ACT2000_FLAGS_IVALID; card->flags &= ~ACT2000_FLAGS_IVALID;
if (card->flags & ACT2000_FLAGS_PVALID) if (card->flags & ACT2000_FLAGS_PVALID)
release_region(card->port, ISA_REGION); release_region(card->port, ISA_REGION);

2
drivers/media/video/zoran_device.c
View File

@ -1415,7 +1415,7 @@ zoran_irq (int irq,
struct zoran *zr; struct zoran *zr;
unsigned long flags; unsigned long flags;
zr = (struct zoran *) dev_id; zr = dev_id;
count = 0; count = 0;
if (zr->testing) { if (zr->testing) {

7
drivers/net/3c509.c
View File

@ -912,16 +912,11 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
static irqreturn_t static irqreturn_t
el3_interrupt(int irq, void *dev_id) el3_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
struct el3_private *lp; struct el3_private *lp;
int ioaddr, status; int ioaddr, status;
int i = max_interrupt_work; int i = max_interrupt_work;
if (dev == NULL) {
printk ("el3_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
lp = netdev_priv(dev); lp = netdev_priv(dev);
spin_lock(&lp->lock); spin_lock(&lp->lock);

7
drivers/net/3c523.c
View File

@ -902,14 +902,11 @@ static void *alloc_rfa(struct net_device *dev, void *ptr)
static irqreturn_t static irqreturn_t
elmc_interrupt(int irq, void *dev_id) elmc_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
unsigned short stat; unsigned short stat;
struct priv *p; struct priv *p;
if (dev == NULL) { if (!netif_running(dev)) {
printk(KERN_ERR "elmc-interrupt: irq %d for unknown device.\n", irq);
return IRQ_NONE;
} else if (!netif_running(dev)) {
/* The 3c523 has this habit of generating interrupts during the /* The 3c523 has this habit of generating interrupts during the
reset. I'm not sure if the ni52 has this same problem, but it's reset. I'm not sure if the ni52 has this same problem, but it's
really annoying if we haven't finished initializing it. I was really annoying if we haven't finished initializing it. I was

5
drivers/net/3c527.c
View File

@ -1324,11 +1324,6 @@ static irqreturn_t mc32_interrupt(int irq, void *dev_id)
int rx_event = 0; int rx_event = 0;
int tx_event = 0; int tx_event = 0;
if (dev == NULL) {
printk(KERN_WARNING "%s: irq %d for unknown device.\n", cardname, irq);
return IRQ_NONE;
}
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
lp = netdev_priv(dev); lp = netdev_priv(dev);

8
drivers/net/8390.c
View File

@ -406,14 +406,8 @@ irqreturn_t ei_interrupt(int irq, void *dev_id)
int interrupts, nr_serviced = 0; int interrupts, nr_serviced = 0;
struct ei_device *ei_local; struct ei_device *ei_local;
if (dev == NULL)
{
printk ("net_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
e8390_base = dev->base_addr; e8390_base = dev->base_addr;
ei_local = (struct ei_device *) netdev_priv(dev); ei_local = netdev_priv(dev);
/* /*
* Protect the irq test too. * Protect the irq test too.

6
drivers/net/atp.c
View File

@ -598,17 +598,13 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev)
Handle the network interface interrupts. */ Handle the network interface interrupts. */
static irqreturn_t atp_interrupt(int irq, void *dev_instance) static irqreturn_t atp_interrupt(int irq, void *dev_instance)
{ {
struct net_device *dev = (struct net_device *)dev_instance; struct net_device *dev = dev_instance;
struct net_local *lp; struct net_local *lp;
long ioaddr; long ioaddr;
static int num_tx_since_rx; static int num_tx_since_rx;
int boguscount = max_interrupt_work; int boguscount = max_interrupt_work;
int handled = 0; int handled = 0;
if (dev == NULL) {
printk(KERN_ERR "ATP_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
lp = netdev_priv(dev); lp = netdev_priv(dev);

6
drivers/net/de600.c
View File

@ -265,12 +265,6 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id)
int retrig = 0; int retrig = 0;
int boguscount = 0; int boguscount = 0;
/* This might just as well be deleted now, no crummy drivers present :-) */
if ((dev == NULL) || (DE600_IRQ != irq)) {
printk(KERN_ERR "%s: bogus interrupt %d\n", dev?dev->name:"DE-600", irq);
return IRQ_NONE;
}
spin_lock(&de600_lock); spin_lock(&de600_lock);
select_nic(); select_nic();

4
drivers/net/declance.c
View File

@ -696,7 +696,7 @@ static void lance_tx(struct net_device *dev)
static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id) static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
printk("%s: DMA error\n", dev->name); printk("%s: DMA error\n", dev->name);
return IRQ_HANDLED; return IRQ_HANDLED;
@ -704,7 +704,7 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
static irqreturn_t lance_interrupt(const int irq, void *dev_id) static irqreturn_t lance_interrupt(const int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_regs *ll = lp->ll; volatile struct lance_regs *ll = lp->ll;
int csr0; int csr0;

4
drivers/net/dgrs.c
View File

@ -897,8 +897,8 @@ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd)
static irqreturn_t dgrs_intr(int irq, void *dev_id) static irqreturn_t dgrs_intr(int irq, void *dev_id)
{ {
struct net_device *dev0 = (struct net_device *) dev_id; struct net_device *dev0 = dev_id;
DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; DGRS_PRIV *priv0 = dev0->priv;
I596_CB *cbp; I596_CB *cbp;
int cmd; int cmd;
int i; int i;

22
drivers/net/eepro.c
View File

@ -994,16 +994,6 @@ static int eepro_open(struct net_device *dev)
return -EAGAIN; return -EAGAIN;
} }
#ifdef irq2dev_map
if (((irq2dev_map[dev->irq] != 0)
|| (irq2dev_map[dev->irq] = dev) == 0) &&
(irq2dev_map[dev->irq]!=dev)) {
/* printk("%s: IRQ map wrong\n", dev->name); */
free_irq(dev->irq, dev);
return -EAGAIN;
}
#endif
/* Initialize the 82595. */ /* Initialize the 82595. */
eepro_sw2bank2(ioaddr); /* be CAREFUL, BANK 2 now */ eepro_sw2bank2(ioaddr); /* be CAREFUL, BANK 2 now */
@ -1198,17 +1188,11 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)
static irqreturn_t static irqreturn_t
eepro_interrupt(int irq, void *dev_id) eepro_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
/* (struct net_device *)(irq2dev_map[irq]);*/
struct eepro_local *lp; struct eepro_local *lp;
int ioaddr, status, boguscount = 20; int ioaddr, status, boguscount = 20;
int handled = 0; int handled = 0;
if (dev == NULL) {
printk (KERN_ERR "eepro_interrupt(): irq %d for unknown device.\\n", irq);
return IRQ_NONE;
}
lp = netdev_priv(dev); lp = netdev_priv(dev);
spin_lock(&lp->lock); spin_lock(&lp->lock);
@ -1288,10 +1272,6 @@ static int eepro_close(struct net_device *dev)
/* release the interrupt */ /* release the interrupt */
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
#ifdef irq2dev_map
irq2dev_map[dev->irq] = 0;
#endif
/* Update the statistics here. What statistics? */ /* Update the statistics here. What statistics? */
return 0; return 0;

7
drivers/net/eexpress.c
View File

@ -796,13 +796,6 @@ static irqreturn_t eexp_irq(int irq, void *dev_info)
unsigned short ioaddr,status,ack_cmd; unsigned short ioaddr,status,ack_cmd;
unsigned short old_read_ptr, old_write_ptr; unsigned short old_read_ptr, old_write_ptr;
if (dev==NULL)
{
printk(KERN_WARNING "eexpress: irq %d for unknown device\n",
irq);
return IRQ_NONE;
}
lp = netdev_priv(dev); lp = netdev_priv(dev);
ioaddr = dev->base_addr; ioaddr = dev->base_addr;

10
drivers/net/irda/ali-ircc.c
View File

@ -662,19 +662,13 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info)
*/ */
static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id) static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct ali_ircc_cb *self; struct ali_ircc_cb *self;
int ret; int ret;
IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__); IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);
if (!dev) { self = dev->priv;
IRDA_WARNING("%s: irq %d for unknown device.\n",
ALI_IRCC_DRIVER_NAME, irq);
return IRQ_NONE;
}
self = (struct ali_ircc_cb *) dev->priv;
spin_lock(&self->lock); spin_lock(&self->lock);

11
drivers/net/irda/donauboe.c
View File

@ -657,12 +657,6 @@ toshoboe_makemttpacket (struct toshoboe_cb *self, void *buf, int mtt)
return xbofs; return xbofs;
} }
static int toshoboe_invalid_dev(int irq)
{
printk (KERN_WARNING DRIVER_NAME ": irq %d for unknown device.\n", irq);
return 1;
}
#ifdef USE_PROBE #ifdef USE_PROBE
/***********************************************************************/ /***********************************************************************/
/* Probe code */ /* Probe code */
@ -711,12 +705,9 @@ stuff_byte (__u8 byte, __u8 * buf)
static irqreturn_t static irqreturn_t
toshoboe_probeinterrupt (int irq, void *dev_id) toshoboe_probeinterrupt (int irq, void *dev_id)
{ {
struct toshoboe_cb *self = (struct toshoboe_cb *) dev_id; struct toshoboe_cb *self = dev_id;
__u8 irqstat; __u8 irqstat;
if (self == NULL && toshoboe_invalid_dev(irq))
return IRQ_NONE;
irqstat = INB (OBOE_ISR); irqstat = INB (OBOE_ISR);
/* was it us */ /* was it us */

8
drivers/net/irda/irport.c
View File

@ -766,18 +766,14 @@ static inline void irport_receive(struct irport_cb *self)
*/ */
static irqreturn_t irport_interrupt(int irq, void *dev_id) static irqreturn_t irport_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct irport_cb *self; struct irport_cb *self;
int boguscount = 0; int boguscount = 0;
int iobase; int iobase;
int iir, lsr; int iir, lsr;
int handled = 0; int handled = 0;
if (!dev) { self = dev->priv;
IRDA_WARNING("%s() irq %d for unknown device.\n", __FUNCTION__, irq);
return IRQ_NONE;
}
self = (struct irport_cb *) dev->priv;
spin_lock(&self->lock); spin_lock(&self->lock);

2
drivers/net/irda/irport.h
View File

@ -74,7 +74,7 @@ struct irport_cb {
/* For piggyback drivers */ /* For piggyback drivers */
void *priv; void *priv;
void (*change_speed)(void *priv, __u32 speed); void (*change_speed)(void *priv, __u32 speed);
int (*interrupt)(int irq, void *dev_id); irqreturn_t (*interrupt)(int irq, void *dev_id);
}; };
#endif /* IRPORT_H */ #endif /* IRPORT_H */

9
drivers/net/irda/nsc-ircc.c
View File

@ -2068,17 +2068,12 @@ static void nsc_ircc_fir_interrupt(struct nsc_ircc_cb *self, int iobase,
*/ */
static irqreturn_t nsc_ircc_interrupt(int irq, void *dev_id) static irqreturn_t nsc_ircc_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct nsc_ircc_cb *self; struct nsc_ircc_cb *self;
__u8 bsr, eir; __u8 bsr, eir;
int iobase; int iobase;
if (!dev) { self = dev->priv;
IRDA_WARNING("%s: irq %d for unknown device.\n",
driver_name, irq);
return IRQ_NONE;
}
self = (struct nsc_ircc_cb *) dev->priv;
spin_lock(&self->lock); spin_lock(&self->lock);

9
drivers/net/irda/w83977af_ir.c
View File

@ -1113,17 +1113,12 @@ static __u8 w83977af_fir_interrupt(struct w83977af_ir *self, int isr)
*/ */
static irqreturn_t w83977af_interrupt(int irq, void *dev_id) static irqreturn_t w83977af_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct w83977af_ir *self; struct w83977af_ir *self;
__u8 set, icr, isr; __u8 set, icr, isr;
int iobase; int iobase;
if (!dev) { self = dev->priv;
printk(KERN_WARNING "%s: irq %d for unknown device.\n",
driver_name, irq);
return IRQ_NONE;
}
self = (struct w83977af_ir *) dev->priv;
iobase = self->io.fir_base; iobase = self->io.fir_base;

5
drivers/net/lance.c
View File

@ -1019,11 +1019,6 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
int csr0, ioaddr, boguscnt=10; int csr0, ioaddr, boguscnt=10;
int must_restart; int must_restart;
if (dev == NULL) {
printk ("lance_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
lp = dev->priv; lp = dev->priv;

8
drivers/net/pcmcia/axnet_cs.c
View File

@ -1201,14 +1201,8 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
struct ei_device *ei_local; struct ei_device *ei_local;
int handled = 0; int handled = 0;
if (dev == NULL)
{
printk ("net_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
e8390_base = dev->base_addr; e8390_base = dev->base_addr;
ei_local = (struct ei_device *) netdev_priv(dev); ei_local = netdev_priv(dev);
/* /*
* Protect the irq test too. * Protect the irq test too.

7
drivers/net/pcnet32.c
View File

@ -2569,13 +2569,6 @@ pcnet32_interrupt(int irq, void *dev_id)
u16 csr0; u16 csr0;
int boguscnt = max_interrupt_work; int boguscnt = max_interrupt_work;
if (!dev) {
if (pcnet32_debug & NETIF_MSG_INTR)
printk(KERN_DEBUG "%s(): irq %d for unknown device\n",
__FUNCTION__, irq);
return IRQ_NONE;
}
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
lp = dev->priv; lp = dev->priv;

5
drivers/net/plip.c
View File

@ -909,11 +909,6 @@ plip_interrupt(int irq, void *dev_id)
struct plip_local *rcv; struct plip_local *rcv;
unsigned char c0; unsigned char c0;
if (dev == NULL) {
printk(KERN_DEBUG "plip_interrupt: irq %d for unknown device.\n", irq);
return;
}
nl = netdev_priv(dev); nl = netdev_priv(dev);
rcv = &nl->rcv_data; rcv = &nl->rcv_data;

2
drivers/net/saa9730.c
View File

@ -747,7 +747,7 @@ static int lan_saa9730_rx(struct net_device *dev)
static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id) static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct lan_saa9730_private *lp = netdev_priv(dev); struct lan_saa9730_private *lp = netdev_priv(dev);
if (lan_saa9730_debug > 5) if (lan_saa9730_debug > 5)

8
drivers/net/sb1000.c
View File

@ -1084,19 +1084,13 @@ static irqreturn_t sb1000_interrupt(int irq, void *dev_id)
char *name; char *name;
unsigned char st; unsigned char st;
int ioaddr[2]; int ioaddr[2];
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct sb1000_private *lp = netdev_priv(dev); struct sb1000_private *lp = netdev_priv(dev);
const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00}; const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00}; const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
const int MaxRxErrorCount = 6; const int MaxRxErrorCount = 6;
if (dev == NULL) {
printk(KERN_ERR "sb1000_interrupt(): irq %d for unknown device.\n",
irq);
return IRQ_NONE;
}
ioaddr[0] = dev->base_addr; ioaddr[0] = dev->base_addr;
/* mem_start holds the second I/O address */ /* mem_start holds the second I/O address */
ioaddr[1] = dev->mem_start; ioaddr[1] = dev->mem_start;

7
drivers/net/skfp/skfddi.c
View File

@ -616,15 +616,10 @@ static int skfp_close(struct net_device *dev)
irqreturn_t skfp_interrupt(int irq, void *dev_id) irqreturn_t skfp_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct s_smc *smc; /* private board structure pointer */ struct s_smc *smc; /* private board structure pointer */
skfddi_priv *bp; skfddi_priv *bp;
if (dev == NULL) {
printk("%s: irq %d for unknown device\n", dev->name, irq);
return IRQ_NONE;
}
smc = netdev_priv(dev); smc = netdev_priv(dev);
bp = &smc->os; bp = &smc->os;

7
drivers/net/sonic.c
View File

@ -295,15 +295,10 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
*/ */
static irqreturn_t sonic_interrupt(int irq, void *dev_id) static irqreturn_t sonic_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct sonic_local *lp = netdev_priv(dev); struct sonic_local *lp = netdev_priv(dev);
int status; int status;
if (dev == NULL) {
printk(KERN_ERR "sonic_interrupt: irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
if (!(status = SONIC_READ(SONIC_ISR) & SONIC_IMR_DEFAULT)) if (!(status = SONIC_READ(SONIC_ISR) & SONIC_IMR_DEFAULT))
return IRQ_NONE; return IRQ_NONE;

4
drivers/net/sunhme.c
View File

@ -2095,8 +2095,8 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
static irqreturn_t happy_meal_interrupt(int irq, void *dev_id) static irqreturn_t happy_meal_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = dev_id;
struct happy_meal *hp = dev->priv; struct happy_meal *hp = netdev_priv(dev);
u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT); u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT);
HMD(("happy_meal_interrupt: status=%08x ", happy_status)); HMD(("happy_meal_interrupt: status=%08x ", happy_status));

2
drivers/net/sunlance.c
View File

@ -822,7 +822,7 @@ static void lance_tx_pio(struct net_device *dev)
static irqreturn_t lance_interrupt(int irq, void *dev_id) static irqreturn_t lance_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
int csr0; int csr0;

2
drivers/net/sunqe.c
View File

@ -468,7 +468,7 @@ static void qe_tx_reclaim(struct sunqe *qep);
*/ */
static irqreturn_t qec_interrupt(int irq, void *dev_id) static irqreturn_t qec_interrupt(int irq, void *dev_id)
{ {
struct sunqec *qecp = (struct sunqec *) dev_id; struct sunqec *qecp = dev_id;
u32 qec_status; u32 qec_status;
int channel = 0; int channel = 0;

7
drivers/net/tokenring/smctr.c
View File

@ -1990,15 +1990,8 @@ static irqreturn_t smctr_interrupt(int irq, void *dev_id)
__u8 isb_type, isb_subtype; __u8 isb_type, isb_subtype;
__u16 isb_index; __u16 isb_index;
if(dev == NULL)
{
printk(KERN_CRIT "%s: irq %d for unknown device.\n", dev->name, irq);
return IRQ_NONE;
}
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
tp = netdev_priv(dev); tp = netdev_priv(dev);
if(tp->status == NOT_INITIALIZED) if(tp->status == NOT_INITIALIZED)
return IRQ_NONE; return IRQ_NONE;

5
drivers/net/tokenring/tms380tr.c
View File

@ -751,11 +751,6 @@ irqreturn_t tms380tr_interrupt(int irq, void *dev_id)
unsigned short irq_type; unsigned short irq_type;
int handled = 0; int handled = 0;
if(dev == NULL) {
printk(KERN_INFO "%s: irq %d for unknown device.\n", dev->name, irq);
return IRQ_NONE;
}
tp = netdev_priv(dev); tp = netdev_priv(dev);
irq_type = SIFREADW(SIFSTS); irq_type = SIFREADW(SIFSTS);

6
drivers/net/tulip/de4x5.c
View File

@ -1540,16 +1540,12 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
static irqreturn_t static irqreturn_t
de4x5_interrupt(int irq, void *dev_id) de4x5_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
struct de4x5_private *lp; struct de4x5_private *lp;
s32 imr, omr, sts, limit; s32 imr, omr, sts, limit;
u_long iobase; u_long iobase;
unsigned int handled = 0; unsigned int handled = 0;
if (dev == NULL) {
printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
lp = netdev_priv(dev); lp = netdev_priv(dev);
spin_lock(&lp->lock); spin_lock(&lp->lock);
iobase = dev->base_addr; iobase = dev->base_addr;

4
drivers/net/wan/cycx_main.c
View File

@ -303,9 +303,9 @@ out: return ret;
*/ */
static irqreturn_t cycx_isr(int irq, void *dev_id) static irqreturn_t cycx_isr(int irq, void *dev_id)
{ {
struct cycx_device *card = (struct cycx_device *)dev_id; struct cycx_device *card = dev_id;
if (!card || card->wandev.state == WAN_UNCONFIGURED) if (card->wandev.state == WAN_UNCONFIGURED)
goto out; goto out;
if (card->in_isr) { if (card->in_isr) {

8
drivers/net/wan/sdla.c
View File

@ -875,13 +875,7 @@ static irqreturn_t sdla_isr(int irq, void *dev_id)
dev = dev_id; dev = dev_id;
if (dev == NULL) flp = netdev_priv(dev);
{
printk(KERN_WARNING "sdla_isr(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
flp = dev->priv;
if (!flp->initialized) if (!flp->initialized)
{ {

2
drivers/net/wireless/orinoco.c
View File

@ -1954,7 +1954,7 @@ static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw)
irqreturn_t orinoco_interrupt(int irq, void *dev_id) irqreturn_t orinoco_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
hermes_t *hw = &priv->hw; hermes_t *hw = &priv->hw;
int count = MAX_IRQLOOPS_PER_IRQ; int count = MAX_IRQLOOPS_PER_IRQ;

11
drivers/net/wireless/wavelan_cs.c
View File

@ -4119,21 +4119,12 @@ static irqreturn_t
wavelan_interrupt(int irq, wavelan_interrupt(int irq,
void * dev_id) void * dev_id)
{ {
struct net_device * dev; struct net_device * dev = dev_id;
net_local * lp; net_local * lp;
kio_addr_t base; kio_addr_t base;
int status0; int status0;
u_int tx_status; u_int tx_status;
if ((dev = dev_id) == NULL)
{
#ifdef DEBUG_INTERRUPT_ERROR
printk(KERN_WARNING "wavelan_interrupt(): irq %d for unknown device.\n",
irq);
#endif
return IRQ_NONE;
}
#ifdef DEBUG_INTERRUPT_TRACE #ifdef DEBUG_INTERRUPT_TRACE
printk(KERN_DEBUG "%s: ->wavelan_interrupt()\n", dev->name); printk(KERN_DEBUG "%s: ->wavelan_interrupt()\n", dev->name);
#endif #endif

15
drivers/net/wireless/wl3501_cs.c
View File

@ -1155,25 +1155,18 @@ static inline void wl3501_ack_interrupt(struct wl3501_card *this)
*/ */
static irqreturn_t wl3501_interrupt(int irq, void *dev_id) static irqreturn_t wl3501_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = dev_id;
struct wl3501_card *this; struct wl3501_card *this;
int handled = 1;
if (!dev) this = netdev_priv(dev);
goto unknown;
this = dev->priv;
spin_lock(&this->lock); spin_lock(&this->lock);
wl3501_ack_interrupt(this); wl3501_ack_interrupt(this);
wl3501_block_interrupt(this); wl3501_block_interrupt(this);
wl3501_rx_interrupt(dev); wl3501_rx_interrupt(dev);
wl3501_unblock_interrupt(this); wl3501_unblock_interrupt(this);
spin_unlock(&this->lock); spin_unlock(&this->lock);
out:
return IRQ_RETVAL(handled); return IRQ_HANDLED;
unknown:
handled = 0;
printk(KERN_ERR "%s: irq %d for unknown device.\n", __FUNCTION__, irq);
goto out;
} }
static int wl3501_reset_board(struct wl3501_card *this) static int wl3501_reset_board(struct wl3501_card *this)

7
drivers/net/yellowfin.c
View File

@ -896,13 +896,6 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance)
int boguscnt = max_interrupt_work; int boguscnt = max_interrupt_work;
unsigned int handled = 0; unsigned int handled = 0;
#ifndef final_version /* Can never occur. */
if (dev == NULL) {
printk (KERN_ERR "yellowfin_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE;
}
#endif
yp = netdev_priv(dev); yp = netdev_priv(dev);
ioaddr = yp->base; ioaddr = yp->base;

5
drivers/net/znet.c
View File

@ -610,11 +610,6 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)
int boguscnt = 20; int boguscnt = 20;
int handled = 0; int handled = 0;
if (dev == NULL) {
printk(KERN_WARNING "znet_interrupt(): IRQ %d for unknown device.\n", irq);
return IRQ_NONE;
}
spin_lock (&znet->lock); spin_lock (&znet->lock);
ioaddr = dev->base_addr; ioaddr = dev->base_addr;

2
drivers/pcmcia/at91_cf.c
View File

@ -66,7 +66,7 @@ static int at91_cf_ss_init(struct pcmcia_socket *s)
static irqreturn_t at91_cf_irq(int irq, void *_cf) static irqreturn_t at91_cf_irq(int irq, void *_cf)
{ {
struct at91_cf_socket *cf = (struct at91_cf_socket *) _cf; struct at91_cf_socket *cf = _cf;
if (irq == cf->board->det_pin) { if (irq == cf->board->det_pin) {
unsigned present = at91_cf_present(cf); unsigned present = at91_cf_present(cf);

7
drivers/pcmcia/hd64465_ss.c
View File

@ -650,7 +650,7 @@ static int hs_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem)
*/ */
static int hs_irq_demux(int irq, void *dev) static int hs_irq_demux(int irq, void *dev)
{ {
hs_socket_t *sp = (hs_socket_t *)dev; hs_socket_t *sp = dev;
u_int cscr; u_int cscr;
DPRINTK("hs_irq_demux(irq=%d)\n", irq); DPRINTK("hs_irq_demux(irq=%d)\n", irq);
@ -673,11 +673,10 @@ static int hs_irq_demux(int irq, void *dev)
static irqreturn_t hs_interrupt(int irq, void *dev) static irqreturn_t hs_interrupt(int irq, void *dev)
{ {
hs_socket_t *sp = (hs_socket_t *)dev; hs_socket_t *sp = dev;
u_int events = 0; u_int events = 0;
u_int cscr; u_int cscr;
cscr = hs_in(sp, CSCR); cscr = hs_in(sp, CSCR);
DPRINTK("hs_interrupt, cscr=%04x\n", cscr); DPRINTK("hs_interrupt, cscr=%04x\n", cscr);

8
drivers/scsi/NCR53c406a.c
View File

@ -168,7 +168,7 @@ enum Phase {
}; };
/* Static function prototypes */ /* Static function prototypes */
static void NCR53c406a_intr(int, void *); static void NCR53c406a_intr(void *);
static irqreturn_t do_NCR53c406a_intr(int, void *); static irqreturn_t do_NCR53c406a_intr(int, void *);
static void chip_init(void); static void chip_init(void);
static void calc_port_addr(void); static void calc_port_addr(void);
@ -685,7 +685,7 @@ static void wait_intr(void)
return; return;
} }
NCR53c406a_intr(0, NULL, NULL); NCR53c406a_intr(NULL);
} }
#endif #endif
@ -767,12 +767,12 @@ static irqreturn_t do_NCR53c406a_intr(int unused, void *dev_id)
struct Scsi_Host *dev = dev_id; struct Scsi_Host *dev = dev_id;
spin_lock_irqsave(dev->host_lock, flags); spin_lock_irqsave(dev->host_lock, flags);
NCR53c406a_intr(0, dev_id); NCR53c406a_intr(dev_id);
spin_unlock_irqrestore(dev->host_lock, flags); spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void NCR53c406a_intr(int unused, void *dev_id) static void NCR53c406a_intr(void *dev_id)
{ {
DEB(unsigned char fifo_size; DEB(unsigned char fifo_size;
) )

7
drivers/scsi/aha152x.c
View File

@ -759,12 +759,7 @@ static inline Scsi_Cmnd *remove_SC(Scsi_Cmnd **SC, Scsi_Cmnd *SCp)
static irqreturn_t swintr(int irqno, void *dev_id) static irqreturn_t swintr(int irqno, void *dev_id)
{ {
struct Scsi_Host *shpnt = (struct Scsi_Host *)dev_id; struct Scsi_Host *shpnt = dev_id;
if (!shpnt) {
printk(KERN_ERR "aha152x: catched software interrupt %d for unknown controller.\n", irqno);
return IRQ_NONE;
}
HOSTDATA(shpnt)->swint++; HOSTDATA(shpnt)->swint++;

12
drivers/scsi/aic7xxx_old.c
View File

@ -6345,12 +6345,12 @@ aic7xxx_handle_command_completion_intr(struct aic7xxx_host *p)
* SCSI controller interrupt handler. * SCSI controller interrupt handler.
*-F*************************************************************************/ *-F*************************************************************************/
static void static void
aic7xxx_isr(int irq, void *dev_id) aic7xxx_isr(void *dev_id)
{ {
struct aic7xxx_host *p; struct aic7xxx_host *p;
unsigned char intstat; unsigned char intstat;
p = (struct aic7xxx_host *)dev_id; p = dev_id;
/* /*
* Just a few sanity checks. Make sure that we have an int pending. * Just a few sanity checks. Make sure that we have an int pending.
@ -6489,7 +6489,7 @@ do_aic7xxx_isr(int irq, void *dev_id)
p->flags |= AHC_IN_ISR; p->flags |= AHC_IN_ISR;
do do
{ {
aic7xxx_isr(irq, dev_id); aic7xxx_isr(dev_id);
} while ( (aic_inb(p, INTSTAT) & INT_PEND) ); } while ( (aic_inb(p, INTSTAT) & INT_PEND) );
aic7xxx_done_cmds_complete(p); aic7xxx_done_cmds_complete(p);
aic7xxx_run_waiting_queues(p); aic7xxx_run_waiting_queues(p);
@ -10377,7 +10377,7 @@ static int __aic7xxx_bus_device_reset(struct scsi_cmnd *cmd)
hscb = scb->hscb; hscb = scb->hscb;
aic7xxx_isr(p->irq, (void *)p); aic7xxx_isr(p);
aic7xxx_done_cmds_complete(p); aic7xxx_done_cmds_complete(p);
/* If the command was already complete or just completed, then we didn't /* If the command was already complete or just completed, then we didn't
* do a reset, return FAILED */ * do a reset, return FAILED */
@ -10608,7 +10608,7 @@ static int __aic7xxx_abort(struct scsi_cmnd *cmd)
else else
return FAILED; return FAILED;
aic7xxx_isr(p->irq, (void *)p); aic7xxx_isr(p);
aic7xxx_done_cmds_complete(p); aic7xxx_done_cmds_complete(p);
/* If the command was already complete or just completed, then we didn't /* If the command was already complete or just completed, then we didn't
* do a reset, return FAILED */ * do a reset, return FAILED */
@ -10863,7 +10863,7 @@ static int aic7xxx_reset(struct scsi_cmnd *cmd)
while((aic_inb(p, INTSTAT) & INT_PEND) && !(p->flags & AHC_IN_ISR)) while((aic_inb(p, INTSTAT) & INT_PEND) && !(p->flags & AHC_IN_ISR))
{ {
aic7xxx_isr(p->irq, p); aic7xxx_isr(p);
pause_sequencer(p); pause_sequencer(p);
} }
aic7xxx_done_cmds_complete(p); aic7xxx_done_cmds_complete(p);

2
drivers/scsi/dc395x.c
View File

@ -1815,7 +1815,7 @@ static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb,
static irqreturn_t dc395x_interrupt(int irq, void *dev_id) static irqreturn_t dc395x_interrupt(int irq, void *dev_id)
{ {
struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)dev_id; struct AdapterCtlBlk *acb = dev_id;
u16 scsi_status; u16 scsi_status;
u8 dma_status; u8 dma_status;
irqreturn_t handled = IRQ_NONE; irqreturn_t handled = IRQ_NONE;

6
drivers/scsi/qlogicfas408.c
View File

@ -405,10 +405,10 @@ static unsigned int ql_pcmd(Scsi_Cmnd * cmd)
* Interrupt handler * Interrupt handler
*/ */
static void ql_ihandl(int irq, void *dev_id) static void ql_ihandl(void *dev_id)
{ {
Scsi_Cmnd *icmd; Scsi_Cmnd *icmd;
struct Scsi_Host *host = (struct Scsi_Host *)dev_id; struct Scsi_Host *host = dev_id;
struct qlogicfas408_priv *priv = get_priv_by_host(host); struct qlogicfas408_priv *priv = get_priv_by_host(host);
int qbase = priv->qbase; int qbase = priv->qbase;
REG0; REG0;
@ -438,7 +438,7 @@ irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id)
struct Scsi_Host *host = dev_id; struct Scsi_Host *host = dev_id;
spin_lock_irqsave(host->host_lock, flags); spin_lock_irqsave(host->host_lock, flags);
ql_ihandl(irq, dev_id); ql_ihandl(dev_id);
spin_unlock_irqrestore(host->host_lock, flags); spin_unlock_irqrestore(host->host_lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

8
drivers/scsi/tmscsim.c
View File

@ -700,9 +700,9 @@ dc390_InvalidCmd(struct dc390_acb* pACB)
static irqreturn_t __inline__ static irqreturn_t __inline__
DC390_Interrupt(int irq, void *dev_id) DC390_Interrupt(void *dev_id)
{ {
struct dc390_acb *pACB = (struct dc390_acb*)dev_id; struct dc390_acb *pACB = dev_id;
struct dc390_dcb *pDCB; struct dc390_dcb *pDCB;
struct dc390_srb *pSRB; struct dc390_srb *pSRB;
u8 sstatus=0; u8 sstatus=0;
@ -811,12 +811,12 @@ DC390_Interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t do_DC390_Interrupt( int irq, void *dev_id) static irqreturn_t do_DC390_Interrupt(int irq, void *dev_id)
{ {
irqreturn_t ret; irqreturn_t ret;
DEBUG1(printk (KERN_INFO "DC390: Irq (%i) caught: ", irq)); DEBUG1(printk (KERN_INFO "DC390: Irq (%i) caught: ", irq));
/* Locking is done in DC390_Interrupt */ /* Locking is done in DC390_Interrupt */
ret = DC390_Interrupt(irq, dev_id); ret = DC390_Interrupt(dev_id);
DEBUG1(printk (".. IRQ returned\n")); DEBUG1(printk (".. IRQ returned\n"));
return ret; return ret;
} }

8
drivers/scsi/ultrastor.c
View File

@ -287,7 +287,7 @@ static const unsigned short ultrastor_ports_14f[] = {
}; };
#endif #endif
static void ultrastor_interrupt(int, void *); static void ultrastor_interrupt(void *);
static irqreturn_t do_ultrastor_interrupt(int, void *); static irqreturn_t do_ultrastor_interrupt(int, void *);
static inline void build_sg_list(struct mscp *, struct scsi_cmnd *SCpnt); static inline void build_sg_list(struct mscp *, struct scsi_cmnd *SCpnt);
@ -893,7 +893,7 @@ static int ultrastor_abort(struct scsi_cmnd *SCpnt)
spin_lock_irqsave(host->host_lock, flags); spin_lock_irqsave(host->host_lock, flags);
/* FIXME: Ewww... need to think about passing host around properly */ /* FIXME: Ewww... need to think about passing host around properly */
ultrastor_interrupt(0, NULL); ultrastor_interrupt(NULL);
spin_unlock_irqrestore(host->host_lock, flags); spin_unlock_irqrestore(host->host_lock, flags);
return SUCCESS; return SUCCESS;
} }
@ -1039,7 +1039,7 @@ int ultrastor_biosparam(struct scsi_device *sdev, struct block_device *bdev,
return 0; return 0;
} }
static void ultrastor_interrupt(int irq, void *dev_id) static void ultrastor_interrupt(void *dev_id)
{ {
unsigned int status; unsigned int status;
#if ULTRASTOR_MAX_CMDS > 1 #if ULTRASTOR_MAX_CMDS > 1
@ -1177,7 +1177,7 @@ static irqreturn_t do_ultrastor_interrupt(int irq, void *dev_id)
struct Scsi_Host *dev = dev_id; struct Scsi_Host *dev = dev_id;
spin_lock_irqsave(dev->host_lock, flags); spin_lock_irqsave(dev->host_lock, flags);
ultrastor_interrupt(irq, dev_id); ultrastor_interrupt(dev_id);
spin_unlock_irqrestore(dev->host_lock, flags); spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

2
drivers/serial/68360serial.c
View File

@ -620,7 +620,7 @@ static void rs_360_interrupt(int vec, void *dev_id)
volatile struct smc_regs *smcp; volatile struct smc_regs *smcp;
volatile struct scc_regs *sccp; volatile struct scc_regs *sccp;
info = (ser_info_t *)dev_id; info = dev_id;
idx = PORT_NUM(info->state->smc_scc_num); idx = PORT_NUM(info->state->smc_scc_num);
if (info->state->smc_scc_num & NUM_IS_SCC) { if (info->state->smc_scc_num & NUM_IS_SCC) {

2
drivers/serial/jsm/jsm_neo.c
View File

@ -1116,7 +1116,7 @@ static void neo_param(struct jsm_channel *ch)
*/ */
static irqreturn_t neo_intr(int irq, void *voidbrd) static irqreturn_t neo_intr(int irq, void *voidbrd)
{ {
struct jsm_board *brd = (struct jsm_board *) voidbrd; struct jsm_board *brd = voidbrd;
struct jsm_channel *ch; struct jsm_channel *ch;
int port = 0; int port = 0;
int type = 0; int type = 0;

10
drivers/serial/mpc52xx_uart.c
View File

@ -512,19 +512,11 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
static irqreturn_t static irqreturn_t
mpc52xx_uart_int(int irq, void *dev_id) mpc52xx_uart_int(int irq, void *dev_id)
{ {
struct uart_port *port = (struct uart_port *) dev_id; struct uart_port *port = dev_id;
unsigned long pass = ISR_PASS_LIMIT; unsigned long pass = ISR_PASS_LIMIT;
unsigned int keepgoing; unsigned int keepgoing;
unsigned short status; unsigned short status;
if ( irq != port->irq ) {
printk( KERN_WARNING
"mpc52xx_uart_int : " \
"Received wrong int %d. Waiting for %d\n",
irq, port->irq);
return IRQ_NONE;
}
spin_lock(&port->lock); spin_lock(&port->lock);
/* While we have stuff to do, we continue */ /* While we have stuff to do, we continue */

2
drivers/serial/netx-serial.c
View File

@ -247,7 +247,7 @@ static void netx_rxint(struct uart_port *port)
static irqreturn_t netx_int(int irq, void *dev_id) static irqreturn_t netx_int(int irq, void *dev_id)
{ {
struct uart_port *port = (struct uart_port *)dev_id; struct uart_port *port = dev_id;
unsigned long flags; unsigned long flags;
unsigned char status; unsigned char status;

2
drivers/serial/pxa.c
View File

@ -232,7 +232,7 @@ static inline void check_modem_status(struct uart_pxa_port *up)
*/ */
static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id) static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id)
{ {
struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id; struct uart_pxa_port *up = dev_id;
unsigned int iir, lsr; unsigned int iir, lsr;
iir = serial_in(up, UART_IIR); iir = serial_in(up, UART_IIR);

2
drivers/sn/ioc3.c
View File

@ -401,7 +401,7 @@ static inline uint32_t get_pending_intrs(struct ioc3_driver_data *idd)
static irqreturn_t ioc3_intr_io(int irq, void *arg) static irqreturn_t ioc3_intr_io(int irq, void *arg)
{ {
unsigned long flags; unsigned long flags;
struct ioc3_driver_data *idd = (struct ioc3_driver_data *)arg; struct ioc3_driver_data *idd = arg;
int handled = 1, id; int handled = 1, id;
unsigned int pending; unsigned int pending;

2
drivers/spi/pxa2xx_spi.c
View File

@ -669,7 +669,7 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
static irqreturn_t ssp_int(int irq, void *dev_id) static irqreturn_t ssp_int(int irq, void *dev_id)
{ {
struct driver_data *drv_data = (struct driver_data *)dev_id; struct driver_data *drv_data = dev_id;
void *reg = drv_data->ioaddr; void *reg = drv_data->ioaddr;
if (!drv_data->cur_msg) { if (!drv_data->cur_msg) {

2
sound/isa/gus/gusmax.c
View File

@ -107,7 +107,7 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus)
static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
{ {
struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id; struct snd_gusmax *maxcard = dev_id;
int loop, max = 5; int loop, max = 5;
int handled = 0; int handled = 0;

2
sound/isa/gus/interwave.c
View File

@ -301,7 +301,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,
static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
{ {
struct snd_interwave *iwcard = (struct snd_interwave *) dev_id; struct snd_interwave *iwcard = dev_id;
int loop, max = 5; int loop, max = 5;
int handled = 0; int handled = 0;

2
sound/oss/es1371.c
View File

@ -1102,7 +1102,7 @@ static void es1371_handle_midi(struct es1371_state *s)
static irqreturn_t es1371_interrupt(int irq, void *dev_id) static irqreturn_t es1371_interrupt(int irq, void *dev_id)
{ {
struct es1371_state *s = (struct es1371_state *)dev_id; struct es1371_state *s = dev_id;
unsigned int intsrc, sctl; unsigned int intsrc, sctl;
/* fastpath out, to ease interrupt sharing */ /* fastpath out, to ease interrupt sharing */

2
sound/oss/hal2.c
View File

@ -372,7 +372,7 @@ static void hal2_adc_interrupt(struct hal2_codec *adc)
static irqreturn_t hal2_interrupt(int irq, void *dev_id) static irqreturn_t hal2_interrupt(int irq, void *dev_id)
{ {
struct hal2_card *hal2 = (struct hal2_card*)dev_id; struct hal2_card *hal2 = dev_id;
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
/* decide what caused this interrupt */ /* decide what caused this interrupt */

2
sound/oss/i810_audio.c
View File

@ -1525,7 +1525,7 @@ static void i810_channel_interrupt(struct i810_card *card)
static irqreturn_t i810_interrupt(int irq, void *dev_id) static irqreturn_t i810_interrupt(int irq, void *dev_id)
{ {
struct i810_card *card = (struct i810_card *)dev_id; struct i810_card *card = dev_id;
u32 status; u32 status;
spin_lock(&card->lock); spin_lock(&card->lock);

2
sound/oss/mpu401.c
View File

@ -435,7 +435,7 @@ static void mpu401_input_loop(struct mpu_config *devc)
static irqreturn_t mpuintr(int irq, void *dev_id) static irqreturn_t mpuintr(int irq, void *dev_id)
{ {
struct mpu_config *devc; struct mpu_config *devc;
int dev = (int) dev_id; int dev = (int)(unsigned long) dev_id;
int handled = 0; int handled = 0;
devc = &dev_conf[dev]; devc = &dev_conf[dev];

2
sound/oss/vwsnd.c
View File

@ -2235,7 +2235,7 @@ static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status)
static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id) static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)
{ {
vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id; vwsnd_dev_t *devc = dev_id;
unsigned int status; unsigned int status;
DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id); DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);

4
sound/pci/korg1212/korg1212.c
View File

@ -1124,9 +1124,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
u32 doorbellValue; u32 doorbellValue;
struct snd_korg1212 *korg1212 = dev_id; struct snd_korg1212 *korg1212 = dev_id;
if(irq != korg1212->irq)
return IRQ_NONE;
doorbellValue = readl(korg1212->inDoorbellPtr); doorbellValue = readl(korg1212->inDoorbellPtr);
if (!doorbellValue) if (!doorbellValue)
@ -1140,7 +1137,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
korg1212->inIRQ++; korg1212->inIRQ++;
switch (doorbellValue) { switch (doorbellValue) {
case K1212_DB_DSPDownloadDone: case K1212_DB_DSPDownloadDone:
K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n", K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n",