mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* '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:
commit
5a43c09d1b
74 changed files with 106 additions and 329 deletions
|
|
@ -88,7 +88,7 @@ void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int);
|
|||
|
||||
/* riointr.c */
|
||||
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);
|
||||
|
||||
/* rioparam.c */
|
||||
|
|
|
|||
|
|
@ -368,7 +368,7 @@ static irqreturn_t rio_interrupt(int irq, void *ptr)
|
|||
struct Host *HostP;
|
||||
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);
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
||||
RIOServiceHost(p, HostP, irq);
|
||||
RIOServiceHost(p, HostP);
|
||||
|
||||
rio_dprintk(RIO_DEBUG_IFLOW, "riointr() doing host %p type %d\n", ptr, HostP->Type);
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ static int RupIntr;
|
|||
static int RxIntr;
|
||||
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);
|
||||
if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
|
||||
|
|
|
|||
|
|
@ -559,11 +559,10 @@ static irqreturn_t rc_interrupt(int irq, void * dev_id)
|
|||
int handled = 0;
|
||||
|
||||
bp = IRQ_to_board[irq];
|
||||
|
||||
if (!bp || !(bp->flags & RC_BOARD_ACTIVE)) {
|
||||
|
||||
if (!(bp->flags & RC_BOARD_ACTIVE))
|
||||
return IRQ_NONE;
|
||||
}
|
||||
|
||||
|
||||
while ((++loop < 16) && ((status = ~(rc_in(bp, RC_BSR))) &
|
||||
(RC_BSR_TOUT | RC_BSR_TINT |
|
||||
RC_BSR_MINT | RC_BSR_RINT))) {
|
||||
|
|
|
|||
|
|
@ -912,7 +912,7 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id)
|
|||
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);
|
||||
if (!bp || !(bp->flags & SX_BOARD_ACTIVE)) {
|
||||
if (!(bp->flags & SX_BOARD_ACTIVE)) {
|
||||
dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", irq);
|
||||
spin_unlock_irqrestore(&bp->lock, flags);
|
||||
func_exit();
|
||||
|
|
|
|||
Loading…
Reference in a new issue