Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 896c6fa1 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

[ISDN] minor irq handler cleanups 



- reference irq number in CardState structure

- remove now-unused 'intno' argument from rs_interrupt_elsa()

- cs->irq_func() should be defined using standard irq_handler_t

- add KERN_DEBUG to printk() where appropriate

Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a6f97b29

drivers/isdn/hisax/elsa.c

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ elsa_interrupt(int intno, void *dev_id) 
		val = serial_inp(cs, UART_IIR);

		if (!(val & UART_IIR_NO_INT)) {

			debugl1(cs,"IIR %02x", val);

			rs_interrupt_elsa(intno, cs);

			rs_interrupt_elsa(cs);

		}

	}

#endif
@@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id) 
		val = serial_inp(cs, UART_IIR);

		if (!(val & UART_IIR_NO_INT)) {

			debugl1(cs,"IIR %02x", val);

			rs_interrupt_elsa(intno, cs);

			rs_interrupt_elsa(cs);

		}

	}

#endif

drivers/isdn/hisax/elsa_ser.c

+2 −2
Original line number Diff line number Diff line
@@ -384,13 +384,13 @@ static inline void transmit_chars(struct IsdnCardState *cs, int *intr_done) 
}





static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)

static void rs_interrupt_elsa(struct IsdnCardState *cs)

{

	int status, iir, msr;

	int pass_counter = 0;

	

#ifdef SERIAL_DEBUG_INTR

	printk("rs_interrupt_single(%d)...", irq);

	printk(KERN_DEBUG "rs_interrupt_single(%d)...", cs->irq);

#endif



	do {

drivers/isdn/hisax/hisax.h

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ struct IsdnCardState { 
	int		(*cardmsg) (struct IsdnCardState *, int, void *);

	void		(*setstack_d) (struct PStack *, struct IsdnCardState *);

	void		(*DC_Close) (struct IsdnCardState *);

	int		(*irq_func) (int, void *);

	irq_handler_t	irq_func;

	int		(*auxcmd) (struct IsdnCardState *, isdn_ctrl *);

	struct Channel	channel[2+MAX_WAITING_CALLS];

	struct BCState	bcs[2+MAX_WAITING_CALLS];