Skip to content

Commit

Permalink
IRQ: Use the new typedef for interrupt handler function pointers
Browse files Browse the repository at this point in the history 
Use the new typedef for interrupt handler function pointers rather than
actually spelling out the full thing each time.  This was scripted with the
following small shell script:

#!/bin/sh
egrep -nHrl -e 'irqreturn_t[ 	]*[(][*]' $* |
while read i
do
    echo $i
    perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $?
done

Signed-Off-By: David Howells <[email protected]>
  • Loading branch information
@dhowells
dhowells committed Oct 9, 2006
1 parent 58ba81d commit 40220c1
Show file tree
Hide file tree
Showing 46 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static struct platform_device corgits_device = {
*/
static struct pxamci_platform_data corgi_mci_platform_data;

static int corgi_mci_init(struct device *dev, irqreturn_t (*corgi_detect_int)(int, void *), void *data)
static int corgi_mci_init(struct device *dev, irq_handler_t corgi_detect_int, void *data)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/idp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static struct pxafb_mach_info sharp_lm8v31 = {
.pxafb_lcd_power = &idp_lcd_power
};

static int idp_mci_init(struct device *dev, irqreturn_t (*idp_detect_int)(int, void *), void *data)
static int idp_mci_init(struct device *dev, irq_handler_t idp_detect_int, void *data)
{
/* setup GPIO for PXA25x MMC controller */
pxa_gpio_mode(GPIO6_MMCCLK_MD);
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/lubbock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ static struct pxafb_mach_info sharp_lm8v31 = {
#define MMC_POLL_RATE msecs_to_jiffies(1000)

static void lubbock_mmc_poll(unsigned long);
static irqreturn_t (*mmc_detect_int)(int, void *);
static irq_handler_t mmc_detect_int;

static struct timer_list mmc_timer = {
.function = lubbock_mmc_poll,
Expand Down Expand Up @@ -412,7 +412,7 @@ static irqreturn_t lubbock_detect_int(int irq, void *data)
}

static int lubbock_mci_init(struct device *dev,
irqreturn_t (*detect_int)(int, void *),
irq_handler_t detect_int,
void *data)
{
/* setup GPIO for PXA25x MMC controller */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/mainstone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static struct pxafb_mach_info mainstone_pxafb_info = {
.pxafb_backlight_power = mainstone_backlight_power,
};

static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_int)(int, void *), void *data)
static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_int, void *data)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/poodle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static struct platform_device poodle_ts_device = {
*/
static struct pxamci_platform_data poodle_mci_platform_data;

static int poodle_mci_init(struct device *dev, irqreturn_t (*poodle_detect_int)(int, void *), void *data)
static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int, void *data)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/spitz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static struct platform_device spitzts_device = {

static struct pxamci_platform_data spitz_mci_platform_data;

static int spitz_mci_init(struct device *dev, irqreturn_t (*spitz_detect_int)(int, void *), void *data)
static int spitz_mci_init(struct device *dev, irq_handler_t spitz_detect_int, void *data)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/tosa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
*/
static struct pxamci_platform_data tosa_mci_platform_data;

static int tosa_mci_init(struct device *dev, irqreturn_t (*tosa_detect_int)(int, void *), void *data)
static int tosa_mci_init(struct device *dev, irq_handler_t tosa_detect_int, void *data)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/trizeps4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void board_pcmcia_power(int power) {;}
#endif /* CONFIG_MACH_TRIZEPS4_CONXS */
EXPORT_SYMBOL(board_pcmcia_power);

static int trizeps4_mci_init(struct device *dev, irqreturn_t (*mci_detect_int)(int, void *), void *data)
static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int, void *data)
{
int err;
/* setup GPIO for PXA27x MMC controller */
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/hp/sim/simserial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ startup(struct async_struct *info)
{
unsigned long flags;
int retval=0;
irqreturn_t (*handler)(int, void *);
irq_handler_t handler;
struct serial_state *state= info->state;
unsigned long page;

Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/amiga/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static char amiga_model_name[13] = "Amiga ";

extern char m68k_debug_device[];

static void amiga_sched_init(irqreturn_t (*handler)(int, void *));
static void amiga_sched_init(irq_handler_t handler);
/* amiga specific irq functions */
extern void amiga_init_IRQ (void);
static void amiga_get_model(char *model);
Expand Down Expand Up @@ -487,7 +487,7 @@ void __init config_amiga(void)

static unsigned short jiffy_ticks;

static void __init amiga_sched_init(irqreturn_t (*timer_routine)(int, void *))
static void __init amiga_sched_init(irq_handler_t timer_routine)
{
static struct resource sched_res = {
.name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,
Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/apollo/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ u_long cpuctrl_physaddr;
u_long timer_physaddr;
u_long apollo_model;

extern void dn_sched_init(irqreturn_t (*handler)(int,void *));
extern void dn_sched_init(irq_handler_t handler);
extern void dn_init_IRQ(void);
extern unsigned long dn_gettimeoffset(void);
extern int dn_dummy_hwclk(int, struct rtc_time *);
Expand Down Expand Up @@ -176,7 +176,7 @@ void config_apollo(void) {

irqreturn_t dn_timer_int(int irq, void *dev_id)
{
irqreturn_t (*timer_handler)(int, void *) = dev_id;
irq_handler_t timer_handler = dev_id;

volatile unsigned char x;

Expand All @@ -188,7 +188,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id)
return IRQ_HANDLED;
}

void dn_sched_init(irqreturn_t (*timer_routine)(int, void *))
void dn_sched_init(irq_handler_t timer_routine)
{
/* program timer 1 */
*(volatile unsigned char *)(timer+3)=0x01;
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/atari/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static void atari_heartbeat( int on );
#endif

/* atari specific timer functions (in time.c) */
extern void atari_sched_init(irqreturn_t (*)(int, void *));
extern void atari_sched_init(irq_handler_t );
extern unsigned long atari_gettimeoffset (void);
extern int atari_mste_hwclk (int, struct rtc_time *);
extern int atari_tt_hwclk (int, struct rtc_time *);
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/atari/stdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

static int stdma_locked; /* the semaphore */
/* int func to be called */
static irqreturn_t (*stdma_isr)(int, void *);
static irq_handler_t stdma_isr;
static void *stdma_isr_data; /* data passed to isr */
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */

Expand Down Expand Up @@ -75,7 +75,7 @@ static irqreturn_t stdma_int (int irq, void *dummy);
*
*/

void stdma_lock(irqreturn_t (*handler)(int, void *), void *data)
void stdma_lock(irq_handler_t handler, void *data)
{
unsigned long flags;

Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/atari/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <asm/atariints.h>

void __init
atari_sched_init(irqreturn_t (*timer_routine)(int, void *))
atari_sched_init(irq_handler_t timer_routine)
{
/* set Timer C data Register */
mfp.tim_dt_c = INT_TICKS;
Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/bvme6000/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

static void bvme6000_get_model(char *model);
static int bvme6000_get_hardware_list(char *buffer);
extern void bvme6000_sched_init(irqreturn_t (*handler)(int, void *));
extern void bvme6000_sched_init(irq_handler_t handler);
extern unsigned long bvme6000_gettimeoffset (void);
extern int bvme6000_hwclk (int, struct rtc_time *);
extern int bvme6000_set_clock_mmss (unsigned long);
Expand All @@ -52,7 +52,7 @@ static unsigned char bin2bcd (unsigned char b);
/* Save tick handler routine pointer, will point to do_timer() in
* kernel/sched.c, called via bvme6000_process_int() */

static irqreturn_t (*tick_handler)(int, void *);
static irq_handler_t tick_handler;


int bvme6000_parse_bootinfo(const struct bi_record *bi)
Expand Down Expand Up @@ -190,7 +190,7 @@ static irqreturn_t bvme6000_timer_int (int irq, void *dev_id)
* so divide by 8 to get the microsecond result.
*/

void bvme6000_sched_init (irqreturn_t (*timer_routine)(int, void *))
void bvme6000_sched_init (irq_handler_t timer_routine)
{
volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
unsigned char msr = rtc->msr & 0xc0;
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/hp300/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
static irqreturn_t hp300_tick(int irq, void *dev_id)
{
unsigned long tmp;
irqreturn_t (*vector)(int, void *) = dev_id;
irq_handler_t vector = dev_id;
in_8(CLOCKBASE + CLKSR);
asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));
/* Turn off the network and SCSI leds */
Expand All @@ -63,7 +63,7 @@ unsigned long hp300_gettimeoffset(void)
return (USECS_PER_JIFFY * ticks) / INTVAL;
}

void __init hp300_sched_init(irqreturn_t (*vector)(int, void *))
void __init hp300_sched_init(irq_handler_t vector)
{
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x1); /* reset */
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/hp300/time.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern void hp300_sched_init(irqreturn_t (*vector)(int, void *));
extern void hp300_sched_init(irq_handler_t vector);
extern unsigned long hp300_gettimeoffset (void);


2 changes: 1 addition & 1 deletion arch/m68k/kernel/ints.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
}

int request_irq(unsigned int irq,
irqreturn_t (*handler) (int, void *),
irq_handler_t handler,
unsigned long flags, const char *devname, void *dev_id)
{
struct irq_node *node;
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static char m68k_command_line[CL_SIZE];

char m68k_debug_device[6] = "";

void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)) __initdata = NULL;
void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
/* machine dependent irq functions */
void (*mach_init_IRQ) (void) __initdata = NULL;
void (*mach_get_model) (char *model);
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/mac/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extern int show_mac_interrupts(struct seq_file *, void *);
extern void iop_preinit(void);
extern void iop_init(void);
extern void via_init(void);
extern void via_init_clock(irqreturn_t (*func)(int, void *));
extern void via_init_clock(irq_handler_t func);
extern void via_flush_cache(void);
extern void oss_init(void);
extern void psc_init(void);
Expand All @@ -88,7 +88,7 @@ extern void mac_debugging_long(int, long);

static void mac_get_model(char *str);

static void mac_sched_init(irqreturn_t (*vector)(int, void *))
static void mac_sched_init(irq_handler_t vector)
{
via_init_clock(vector);
}
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/mac/via.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void __init via_init(void)
* Start the 100 Hz clock
*/

void __init via_init_clock(irqreturn_t (*func)(int, void *))
void __init via_init_clock(irq_handler_t func)
{
via1[vACR] |= 0x40;
via1[vT1LL] = MAC_CLOCK_LOW;
Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/mvme147/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

static void mvme147_get_model(char *model);
static int mvme147_get_hardware_list(char *buffer);
extern void mvme147_sched_init(irqreturn_t (*handler)(int, void *));
extern void mvme147_sched_init(irq_handler_t handler);
extern unsigned long mvme147_gettimeoffset (void);
extern int mvme147_hwclk (int, struct rtc_time *);
extern int mvme147_set_clock_mmss (unsigned long);
Expand All @@ -51,7 +51,7 @@ static int bcd2int (unsigned char b);
/* Save tick handler routine pointer, will point to do_timer() in
* kernel/sched.c, called via mvme147_process_int() */

irqreturn_t (*tick_handler)(int, void *);
irq_handler_t tick_handler;


int mvme147_parse_bootinfo(const struct bi_record *bi)
Expand Down Expand Up @@ -122,7 +122,7 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id)
}


void mvme147_sched_init (irqreturn_t (*timer_routine)(int, void *))
void mvme147_sched_init (irq_handler_t timer_routine)
{
tick_handler = timer_routine;
request_irq (PCC_IRQ_TIMER1, mvme147_timer_int,
Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/mvme16x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;

static void mvme16x_get_model(char *model);
static int mvme16x_get_hardware_list(char *buffer);
extern void mvme16x_sched_init(irqreturn_t (*handler)(int, void *));
extern void mvme16x_sched_init(irq_handler_t handler);
extern unsigned long mvme16x_gettimeoffset (void);
extern int mvme16x_hwclk (int, struct rtc_time *);
extern int mvme16x_set_clock_mmss (unsigned long);
Expand All @@ -54,7 +54,7 @@ int bcd2int (unsigned char b);
/* Save tick handler routine pointer, will point to do_timer() in
* kernel/sched.c, called via mvme16x_process_int() */

static irqreturn_t (*tick_handler)(int, void *);
static irq_handler_t tick_handler;


unsigned short mvme16x_config;
Expand Down Expand Up @@ -224,7 +224,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)
return tick_handler(irq, dev_id);
}

void mvme16x_sched_init (irqreturn_t (*timer_routine)(int, void *))
void mvme16x_sched_init (irq_handler_t timer_routine)
{
p_bdid p = &mvme_bdid;
int irq;
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/q40/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern irqreturn_t q40_process_int (int level, struct pt_regs *regs);
extern void q40_init_IRQ (void);
static void q40_get_model(char *model);
static int q40_get_hardware_list(char *buffer);
extern void q40_sched_init(irqreturn_t (*handler)(int, void *));
extern void q40_sched_init(irq_handler_t handler);

extern unsigned long q40_gettimeoffset (void);
extern int q40_hwclk (int, struct rtc_time *);
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/q40/q40ints.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void q40_mksound(unsigned int hz, unsigned int ticks)
sound_ticks = ticks << 1;
}

static irqreturn_t (*q40_timer_routine)(int, void *);
static irq_handler_t q40_timer_routine;

static irqreturn_t q40_timer_int (int irq, void * dev)
{
Expand All @@ -142,7 +142,7 @@ static irqreturn_t q40_timer_int (int irq, void * dev)
return IRQ_HANDLED;
}

void q40_sched_init (irqreturn_t (*timer_routine)(int, void *))
void q40_sched_init (irq_handler_t timer_routine)
{
int timer_irq;

Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/sun3/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern char _text, _end;
char sun3_reserved_pmeg[SUN3_PMEGS_NUM];

extern unsigned long sun3_gettimeoffset(void);
extern void sun3_sched_init(irqreturn_t (*handler)(int, void *));
extern void sun3_sched_init(irq_handler_t handler);
extern void sun3_get_model (char* model);
extern void idprom_init (void);
extern int sun3_hwclk(int set, struct rtc_time *t);
Expand Down Expand Up @@ -162,7 +162,7 @@ void __init config_sun3(void)
sun3_bootmem_alloc(memory_start, memory_end);
}

void __init sun3_sched_init(irqreturn_t (*timer_routine)(int, void *))
void __init sun3_sched_init(irq_handler_t timer_routine)
{
sun3_disable_interrupts();
intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE);
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/sun3x/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
}
#endif

void __init sun3x_sched_init(irqreturn_t (*vector)(int, void *))
void __init sun3x_sched_init(irq_handler_t vector)
{

sun3_disable_interrupts();
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/sun3x/time.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

extern int sun3x_hwclk(int set, struct rtc_time *t);
unsigned long sun3x_gettimeoffset (void);
void sun3x_sched_init(irqreturn_t (*vector)(int, void *));
void sun3x_sched_init(irq_handler_t vector);

struct mostek_dt {
volatile unsigned char csr;
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/au1000/common/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void dump_au1000_dma_channel(unsigned int dmanr)
* Requests the DMA done IRQ if irqhandler != NULL.
*/
int request_au1000_dma(int dev_id, const char *dev_str,
irqreturn_t (*irqhandler)(int, void *),
irq_handler_t irqhandler,
unsigned long irqflags,
void *irq_dev_id)
{
Expand Down
Loading

0 comments on commit 40220c1

Please sign in to comment.