A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

Browse source 
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.

The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around.  On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).

Where appropriate, an arch may override the generic storage facility and do
something different with the variable.  On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.

Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions.  Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller.  A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.

I've build this code with allyesconfig for x86_64 and i386.  I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.

This will affect all archs.  Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:

	struct pt_regs *old_regs = set_irq_regs(regs);

And put the old one back at the end:

	set_irq_regs(old_regs);

Don't pass regs through to generic_handle_irq() or __do_IRQ().

In timer_interrupt(), this sort of change will be necessary:

	-	update_process_times(user_mode(regs));
	-	profile_tick(CPU_PROFILING, regs);
	+	update_process_times(user_mode(get_irq_regs()));
	+	profile_tick(CPU_PROFILING);

I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().

Some notes on the interrupt handling in the drivers:

 (*) input_dev() is now gone entirely.  The regs pointer is no longer stored in
     the input_dev struct.

 (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking.  It does
     something different depending on whether it's been supplied with a regs
     pointer or not.

 (*) Various IRQ handler function pointers have been moved to type
     irq_handler_t.

Signed-Off-By: David Howells <[email protected]>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
This commit is contained in:
David Howells 2006-10-05 14:55:46 +01:00 • committed by David Howells
commit 7d12e780e0
1079 changed files with 2621 additions and 2976 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/isdn/act2000/act2000_isa.c
View file

@ -63,7 +63,7 @@ act2000_isa_detect(unsigned short portbase)
}
static irqreturn_t
act2000_isa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
act2000_isa_interrupt(int irq, void *dev_id)
{
act2000_card *card = irq2card_map[irq];
u_char istatus;

12
drivers/isdn/gigaset/bas-gigaset.c
View file

@ -454,7 +454,7 @@ inline static int update_basstate(struct bas_cardstate *ucs,
* urb USB request block
* urb->context = inbuf structure for controller state
*/
static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
static void read_ctrl_callback(struct urb *urb)
{
struct inbuf_t *inbuf = urb->context;
struct cardstate *cs = inbuf->cs;
@ -596,7 +596,7 @@ static int atread_submit(struct cardstate *cs, int timeout)
* urb USB request block
* urb->context = controller state structure
*/
static void read_int_callback(struct urb *urb, struct pt_regs *regs)
static void read_int_callback(struct urb *urb)
{
struct cardstate *cs = urb->context;
struct bas_cardstate *ucs = cs->hw.bas;
@ -762,7 +762,7 @@ resubmit:
* urb USB request block of completed request
* urb->context = bc_state structure
*/
static void read_iso_callback(struct urb *urb, struct pt_regs *regs)
static void read_iso_callback(struct urb *urb)
{
struct bc_state *bcs;
struct bas_bc_state *ubc;
@ -827,7 +827,7 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs)
* urb USB request block of completed request
* urb->context = isow_urbctx_t structure
*/
static void write_iso_callback(struct urb *urb, struct pt_regs *regs)
static void write_iso_callback(struct urb *urb)
{
struct isow_urbctx_t *ucx;
struct bas_bc_state *ubc;
@ -1415,7 +1415,7 @@ static void req_timeout(unsigned long data)
* urb USB request block of completed request
* urb->context = hardware specific controller state structure
*/
static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs)
static void write_ctrl_callback(struct urb *urb)
{
struct bas_cardstate *ucs = urb->context;
int rc;
@ -1661,7 +1661,7 @@ static void complete_cb(struct cardstate *cs)
* urb USB request block of completed request
* urb->context = controller state structure
*/
static void write_command_callback(struct urb *urb, struct pt_regs *regs)
static void write_command_callback(struct urb *urb)
{
struct cardstate *cs = urb->context;
struct bas_cardstate *ucs = cs->hw.bas;

4
drivers/isdn/gigaset/usb-gigaset.c
View file

@ -362,7 +362,7 @@ static void gigaset_modem_fill(unsigned long data)
*
* It is called if the data was received from the device.
*/
static void gigaset_read_int_callback(struct urb *urb, struct pt_regs *regs)
static void gigaset_read_int_callback(struct urb *urb)
{
struct inbuf_t *inbuf = urb->context;
struct cardstate *cs = inbuf->cs;
@ -420,7 +420,7 @@ static void gigaset_read_int_callback(struct urb *urb, struct pt_regs *regs)
/* This callback routine is called when data was transmitted to the device. */
static void gigaset_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
static void gigaset_write_bulk_callback(struct urb *urb)
{
struct cardstate *cs = urb->context;
unsigned long flags;

4
drivers/isdn/hardware/avm/avmcard.h
View file

@ -554,7 +554,7 @@ void b1_register_appl(struct capi_ctr *ctrl, u16 appl,
void b1_release_appl(struct capi_ctr *ctrl, u16 appl);
u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);
void b1_parse_version(avmctrl_info *card);
irqreturn_t b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs);
irqreturn_t b1_interrupt(int interrupt, void *devptr);
int b1ctl_read_proc(char *page, char **start, off_t off,
int count, int *eof, struct capi_ctr *ctrl);
@ -567,7 +567,7 @@ void avmcard_dma_free(avmcard_dmainfo *);
int b1pciv4_detect(avmcard *card);
int t1pci_detect(avmcard *card);
void b1dma_reset(avmcard *card);
irqreturn_t b1dma_interrupt(int interrupt, void *devptr, struct pt_regs *regs);
irqreturn_t b1dma_interrupt(int interrupt, void *devptr);
int b1dma_load_firmware(struct capi_ctr *ctrl, capiloaddata *data);
void b1dma_reset_ctr(struct capi_ctr *ctrl);

2
drivers/isdn/hardware/avm/b1.c
View file

@ -485,7 +485,7 @@ void b1_parse_version(avmctrl_info *cinfo)
/* ------------------------------------------------------------- */
irqreturn_t b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
irqreturn_t b1_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;
avmctrl_info *cinfo = &card->ctrlinfo[0];

2
drivers/isdn/hardware/avm/b1dma.c
View file

@ -628,7 +628,7 @@ static void b1dma_handle_interrupt(avmcard *card)
spin_unlock(&card->lock);
}
irqreturn_t b1dma_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
irqreturn_t b1dma_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;

2
drivers/isdn/hardware/avm/c4.c
View file

@ -713,7 +713,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
return IRQ_HANDLED;
}
static irqreturn_t c4_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
static irqreturn_t c4_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;

2
drivers/isdn/hardware/avm/t1isa.c
View file

@ -131,7 +131,7 @@ static int t1_detectandinit(unsigned int base, unsigned irq, int cardnr)
return 0;
}
static irqreturn_t t1isa_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
static irqreturn_t t1isa_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;
avmctrl_info *cinfo = &card->ctrlinfo[0];

4
drivers/isdn/hardware/eicon/diva.c
View file

@ -71,8 +71,6 @@ DivaIdiReqFunc(29)
DivaIdiReqFunc(30)
DivaIdiReqFunc(31)
struct pt_regs;
/*
** LOCALS
*/
@ -515,7 +513,7 @@ diva_xdi_read(void *adapter, void *os_handle, void __user *dst,
}
irqreturn_t diva_os_irq_wrapper(int irq, void *context, struct pt_regs *regs)
irqreturn_t diva_os_irq_wrapper(int irq, void *context)
{
diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context;
diva_xdi_clear_interrupts_proc_t clear_int_proc;

3
drivers/isdn/hardware/eicon/divasmain.c
View file

@ -58,8 +58,7 @@ static char *DRIVERLNAME = "divas";
static char *DEVNAME = "Divas";
char *DRIVERRELEASE_DIVAS = "2.0";
extern irqreturn_t diva_os_irq_wrapper(int irq, void *context,
struct pt_regs *regs);
extern irqreturn_t diva_os_irq_wrapper(int irq, void *context);
extern int create_divas_proc(void);
extern void remove_divas_proc(void);
extern void diva_get_vserial_number(PISDN_ADAPTER IoAdapter, char *buf);

2
drivers/isdn/hisax/amd7930_fn.c
View file

@ -733,7 +733,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)
wByteAMD(cs, 0x21, 0x82);
wByteAMD(cs, 0x21, 0x02);
spin_unlock_irqrestore(&cs->lock, flags);
cs->irq_func(cs->irq, cs, NULL);
cs->irq_func(cs->irq, cs);
if (cs->debug & L1_DEB_ISAC)
debugl1(cs, "Amd7930: dbusy_timer_handler: Transmitter reset");

4
drivers/isdn/hisax/asuscom.c
View file

@ -156,7 +156,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs)
asuscom_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;
@ -194,7 +194,7 @@ asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
asuscom_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
asuscom_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista, val, icnt = 5;

2
drivers/isdn/hisax/avm_a1.c
View file

@ -101,7 +101,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
avm_a1_interrupt(int intno, void *dev_id, struct pt_regs *regs)
avm_a1_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, sval;

2
drivers/isdn/hisax/avm_a1p.c
View file

@ -140,7 +140,7 @@ WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size)
#include "hscx_irq.c"
static irqreturn_t
avm_a1p_interrupt(int intno, void *dev_id, struct pt_regs *regs)
avm_a1p_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, sval;

2
drivers/isdn/hisax/avm_pci.c
View file

@ -651,7 +651,7 @@ inithdlc(struct IsdnCardState *cs)
}
static irqreturn_t
avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs)
avm_pcipnp_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;

2
drivers/isdn/hisax/bkm_a4t.c
View file

@ -125,7 +125,7 @@ WriteJADE(struct IsdnCardState *cs, int jade, u_char offset, u_char value)
#include "jade_irq.c"
static irqreturn_t
bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs)
bkm_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val = 0;

2
drivers/isdn/hisax/bkm_a8.c
View file

@ -140,7 +140,7 @@ set_ipac_active(struct IsdnCardState *cs, u_int active)
#include "hscx_irq.c"
static irqreturn_t
bkm_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
bkm_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista, val, icnt = 5;

8
drivers/isdn/hisax/diva.c
View file

@ -289,7 +289,7 @@ MemWriteHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset, u_char val
#include "hscx_irq.c"
static irqreturn_t
diva_interrupt(int intno, void *dev_id, struct pt_regs *regs)
diva_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, sval;
@ -319,7 +319,7 @@ diva_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
diva_irq_ipac_isa(int intno, void *dev_id, struct pt_regs *regs)
diva_irq_ipac_isa(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista,val;
@ -630,7 +630,7 @@ Memhscx_int_main(struct IsdnCardState *cs, u_char val)
}
static irqreturn_t
diva_irq_ipac_pci(int intno, void *dev_id, struct pt_regs *regs)
diva_irq_ipac_pci(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista,val;
@ -685,7 +685,7 @@ Start_IPACPCI:
}
static irqreturn_t
diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs)
diva_irq_ipacx_pci(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

4
drivers/isdn/hisax/elsa.c
View file

@ -282,7 +282,7 @@ TimerRun(struct IsdnCardState *cs)
#include "hscx_irq.c"
static irqreturn_t
elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)
elsa_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;
@ -361,7 +361,7 @@ elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
elsa_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
elsa_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;

2
drivers/isdn/hisax/enternow_pci.c
View file

@ -240,7 +240,7 @@ enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
}
static irqreturn_t
enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
enpci_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
unsigned char s0val, s1val, ir;

4
drivers/isdn/hisax/gazel.c
View file

@ -243,7 +243,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs)
gazel_interrupt(int intno, void *dev_id)
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;
@ -274,7 +274,7 @@ gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs)
static irqreturn_t
gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
gazel_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista, val;

2
drivers/isdn/hisax/hfc4s8s_l1.c
View file

@ -1268,7 +1268,7 @@ hfc4s8s_bh(hfc4s8s_hw * hw)
/* interrupt handler */
/*********************/
static irqreturn_t
hfc4s8s_interrupt(int intno, void *dev_id, struct pt_regs *regs)
hfc4s8s_interrupt(int intno, void *dev_id)
{
hfc4s8s_hw *hw = dev_id;
u_char b, ovr;

2
drivers/isdn/hisax/hfc_pci.c
View file

@ -931,7 +931,7 @@ receive_emsg(struct IsdnCardState *cs)
/* Interrupt handler */
/*********************/
static irqreturn_t
hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
hfcpci_interrupt(int intno, void *dev_id)
{
u_long flags;
struct IsdnCardState *cs = dev_id;

2
drivers/isdn/hisax/hfc_sx.c
View file

@ -691,7 +691,7 @@ receive_emsg(struct IsdnCardState *cs)
/* Interrupt handler */
/*********************/
static irqreturn_t
hfcsx_interrupt(int intno, void *dev_id, struct pt_regs *regs)
hfcsx_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char exval;

8
drivers/isdn/hisax/hfc_usb.c
View file

@ -276,7 +276,7 @@ control_action_handler(hfcusb_data * hfc, int reg, int val, int action)
/* control completion routine handling background control cmds */
/***************************************************************/
static void
ctrl_complete(struct urb *urb, struct pt_regs *regs)
ctrl_complete(struct urb *urb)
{
hfcusb_data *hfc = (hfcusb_data *) urb->context;
ctrl_buft *buf;
@ -603,7 +603,7 @@ static int iso_packets[8] =
/* transmit completion routine for all ISO tx fifos */
/*****************************************************/
static void
tx_iso_complete(struct urb *urb, struct pt_regs *regs)
tx_iso_complete(struct urb *urb)
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
@ -726,7 +726,7 @@ tx_iso_complete(struct urb *urb, struct pt_regs *regs)
/* receive completion routine for all ISO tx fifos */
/*****************************************************/
static void
rx_iso_complete(struct urb *urb, struct pt_regs *regs)
rx_iso_complete(struct urb *urb)
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
@ -919,7 +919,7 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
/* receive completion routine for all rx fifos */
/***********************************************/
static void
rx_complete(struct urb *urb, struct pt_regs *regs)
rx_complete(struct urb *urb)
{
int len;
int status;

2
drivers/isdn/hisax/hfcscard.c
View file

@ -21,7 +21,7 @@ extern const char *CardType[];
static const char *hfcs_revision = "$Revision: 1.10.2.4 $";
static irqreturn_t
hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs)
hfcs_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, stat;

2
drivers/isdn/hisax/hisax.h
View file

@ -941,7 +941,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 *, struct pt_regs *);
int (*irq_func) (int, void *);
int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *);
struct Channel channel[2+MAX_WAITING_CALLS];
struct BCState bcs[2+MAX_WAITING_CALLS];

4
drivers/isdn/hisax/hisax_fcpcipnp.c
View file

@ -651,7 +651,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
// ----------------------------------------------------------------------
static irqreturn_t
fcpci2_irq(int intno, void *dev, struct pt_regs *regs)
fcpci2_irq(int intno, void *dev)
{
struct fritz_adapter *adapter = dev;
unsigned char val;
@ -671,7 +671,7 @@ fcpci2_irq(int intno, void *dev, struct pt_regs *regs)
}
static irqreturn_t
fcpci_irq(int intno, void *dev, struct pt_regs *regs)
fcpci_irq(int intno, void *dev)
{
struct fritz_adapter *adapter = dev;
unsigned char sval;

2
drivers/isdn/hisax/icc.c
View file

@ -608,7 +608,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)
debugl1(cs, "D-Channel Busy no skb");
}
cs->writeisac(cs, ICC_CMDR, 0x01); /* Transmitter reset */
cs->irq_func(cs->irq, cs, NULL);
cs->irq_func(cs->irq, cs);
}
}
}

2
drivers/isdn/hisax/isac.c
View file

@ -609,7 +609,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)
debugl1(cs, "D-Channel Busy no skb");
}
cs->writeisac(cs, ISAC_CMDR, 0x01); /* Transmitter reset */
cs->irq_func(cs->irq, cs, NULL);
cs->irq_func(cs->irq, cs);
}
}
}

2
drivers/isdn/hisax/isurf.c
View file

@ -83,7 +83,7 @@ WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value)
}
static irqreturn_t
isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
isurf_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/ix1_micro.c
View file

@ -125,7 +125,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
ix1micro_interrupt(int intno, void *dev_id, struct pt_regs *regs)
ix1micro_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/mic.c
View file

@ -120,7 +120,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
mic_interrupt(int intno, void *dev_id, struct pt_regs *regs)
mic_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/netjet.h
View file

@ -66,7 +66,7 @@ void read_tiger(struct IsdnCardState *cs);
void write_tiger(struct IsdnCardState *cs);
void netjet_fill_dma(struct BCState *bcs);
void netjet_interrupt(int intno, void *dev_id, struct pt_regs *regs);
void netjet_interrupt(int intno, void *dev_id);
void inittiger(struct IsdnCardState *cs);
void release_io_netjet(struct IsdnCardState *cs);

3
drivers/isdn/hisax/niccy.c
View file

@ -122,8 +122,7 @@ static void WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset,
#include "hscx_irq.c"
static irqreturn_t niccy_interrupt(int intno, void *dev_id,
struct pt_regs *regs)
static irqreturn_t niccy_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/nj_s.c
View file

@ -26,7 +26,7 @@ static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value
}
static irqreturn_t
netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs)
netjet_s_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, s1val, s0val;

2
drivers/isdn/hisax/nj_u.c
View file

@ -26,7 +26,7 @@ static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value
}
static irqreturn_t
netjet_u_interrupt(int intno, void *dev_id, struct pt_regs *regs)
netjet_u_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, sval;

2
drivers/isdn/hisax/s0box.c
View file

@ -141,7 +141,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
s0box_interrupt(int intno, void *dev_id, struct pt_regs *regs)
s0box_interrupt(int intno, void *dev_id)
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;

2
drivers/isdn/hisax/saphir.c
View file

@ -117,7 +117,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
saphir_interrupt(int intno, void *dev_id, struct pt_regs *regs)
saphir_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

6
drivers/isdn/hisax/sedlbauer.c
View file

@ -260,7 +260,7 @@ WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
sedlbauer_interrupt(int intno, void *dev_id, struct pt_regs *regs)
sedlbauer_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;
@ -306,7 +306,7 @@ sedlbauer_interrupt(int intno, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
sedlbauer_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
sedlbauer_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista, val, icnt = 5;
@ -353,7 +353,7 @@ Start_IPAC:
}
static irqreturn_t
sedlbauer_interrupt_isar(int intno, void *dev_id, struct pt_regs *regs)
sedlbauer_interrupt_isar(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/sportster.c
View file

@ -99,7 +99,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
sportster_interrupt(int intno, void *dev_id, struct pt_regs *regs)
sportster_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/st5481_b.c
View file

@ -161,7 +161,7 @@ static void led_blink(struct st5481_adapter *adapter)
st5481_usb_device_ctrl_msg(adapter, GPIO_OUT, leds, NULL, NULL);
}
static void usb_b_out_complete(struct urb *urb, struct pt_regs *regs)
static void usb_b_out_complete(struct urb *urb)
{
struct st5481_bcs *bcs = urb->context;
struct st5481_b_out *b_out = &bcs->b_out;

2
drivers/isdn/hisax/st5481_d.c
View file

@ -370,7 +370,7 @@ static void fifo_reseted(void *context)
FsmEvent(&adapter->d_out.fsm, EV_DOUT_RESETED, NULL);
}
static void usb_d_out_complete(struct urb *urb, struct pt_regs *regs)
static void usb_d_out_complete(struct urb *urb)
{
struct st5481_adapter *adapter = urb->context;
struct st5481_d_out *d_out = &adapter->d_out;

6
drivers/isdn/hisax/st5481_usb.c
View file

@ -125,7 +125,7 @@ void st5481_ph_command(struct st5481_adapter *adapter, unsigned int command)
* Call the user provided completion routine and try
* to send the next request.
*/
static void usb_ctrl_complete(struct urb *urb, struct pt_regs *regs)
static void usb_ctrl_complete(struct urb *urb)
{
struct st5481_adapter *adapter = urb->context;
struct st5481_ctrl *ctrl = &adapter->ctrl;
@ -179,7 +179,7 @@ static void usb_ctrl_complete(struct urb *urb, struct pt_regs *regs)
* Decode the register values and schedule a private event.
* Called at interrupt.
*/
static void usb_int_complete(struct urb *urb, struct pt_regs *regs)
static void usb_int_complete(struct urb *urb)
{
u8 *data = urb->transfer_buffer;
u8 irqbyte;
@ -483,7 +483,7 @@ void st5481_release_isocpipes(struct urb* urb[2])
* called 50 times per second with 20 ISOC descriptors.
* Called at interrupt.
*/
static void usb_in_complete(struct urb *urb, struct pt_regs *regs)
static void usb_in_complete(struct urb *urb)
{
struct st5481_in *in = urb->context;
unsigned char *ptr;

2
drivers/isdn/hisax/teleint.c
View file

@ -157,7 +157,7 @@ WriteHFC(struct IsdnCardState *cs, int data, u_char reg, u_char value)
}
static irqreturn_t
TeleInt_interrupt(int intno, void *dev_id, struct pt_regs *regs)
TeleInt_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/teles0.c
View file

@ -144,7 +144,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
teles0_interrupt(int intno, void *dev_id, struct pt_regs *regs)
teles0_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;

2
drivers/isdn/hisax/teles3.c
View file

@ -101,7 +101,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
teles3_interrupt(int intno, void *dev_id, struct pt_regs *regs)
teles3_interrupt(int intno, void *dev_id)
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;

2
drivers/isdn/hisax/telespci.c
View file

@ -226,7 +226,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
telespci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
telespci_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char hval, ival;

4
drivers/isdn/hisax/w6692.c
View file

@ -400,7 +400,7 @@ W6692B_interrupt(struct IsdnCardState *cs, u_char bchan)
}
static irqreturn_t
W6692_interrupt(int intno, void *dev_id, struct pt_regs *regs)
W6692_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, exval, v1;
@ -715,7 +715,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)
}
cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_XRST); /* Transmitter reset */
spin_unlock_irqrestore(&cs->lock, flags);
cs->irq_func(cs->irq, cs, NULL);
cs->irq_func(cs->irq, cs);
return;
}
}

2
drivers/isdn/hysdn/boardergo.c
View file

@ -33,7 +33,7 @@
/* The cards interrupt handler. Called from system */
/***************************************************/
static irqreturn_t
ergo_interrupt(int intno, void *dev_id, struct pt_regs *regs)
ergo_interrupt(int intno, void *dev_id)
{
hysdn_card *card = dev_id; /* parameter from irq */
tErgDpram *dpr;

2
drivers/isdn/pcbit/layer2.c
View file

@ -512,7 +512,7 @@ pcbit_firmware_bug(struct pcbit_dev *dev)
}
irqreturn_t
pcbit_irq_handler(int interrupt, void *devptr, struct pt_regs *regs)
pcbit_irq_handler(int interrupt, void *devptr)
{
struct pcbit_dev *dev;
u_char info,

2
drivers/isdn/pcbit/layer2.h
View file

@ -124,7 +124,7 @@ struct frame_buf {
extern int pcbit_l2_write(struct pcbit_dev * dev, ulong msg, ushort refnum,
struct sk_buff *skb, unsigned short hdr_len);
extern irqreturn_t pcbit_irq_handler(int interrupt, void *, struct pt_regs *regs);
extern irqreturn_t pcbit_irq_handler(int interrupt, void *);
extern struct pcbit_dev * dev_pcbit[MAX_PCBIT_CARDS];

2
drivers/isdn/sc/init.c
View file

@ -35,7 +35,7 @@ module_param_array(irq, int, NULL, 0);
module_param_array(ram, int, NULL, 0);
module_param(do_reset, bool, 0);
extern irqreturn_t interrupt_handler(int, void *, struct pt_regs *);
extern irqreturn_t interrupt_handler(int, void *);
extern int sndpkt(int, int, int, struct sk_buff *);
extern int command(isdn_ctrl *);
extern int indicate_status(int, int, ulong, char*);

2
drivers/isdn/sc/interrupt.c
View file

@ -45,7 +45,7 @@ static int get_card_from_irq(int irq)
/*
*
*/
irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs)
irqreturn_t interrupt_handler(int interrupt, void *cardptr)
{
RspMessage rcvmsg;