mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6: IRQ: Use the new typedef for interrupt handler function pointers
This commit is contained in:
commit
9b6d99f48d
46 changed files with 70 additions and 70 deletions
|
|
@ -10,7 +10,7 @@ struct mmc_host;
|
|||
struct pxamci_platform_data {
|
||||
unsigned int ocr_mask; /* available voltages */
|
||||
unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */
|
||||
int (*init)(struct device *, irqreturn_t (*)(int, void *), void *);
|
||||
int (*init)(struct device *, irq_handler_t , void *);
|
||||
int (*get_ro)(struct device *);
|
||||
void (*setpower)(struct device *, unsigned int);
|
||||
void (*exit)(struct device *, void *);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
/***************************** Prototypes *****************************/
|
||||
|
||||
void stdma_lock(irqreturn_t (*handler)(int, void *), void *data);
|
||||
void stdma_lock(irq_handler_t handler, void *data);
|
||||
void stdma_release( void );
|
||||
int stdma_others_waiting( void );
|
||||
int stdma_islocked( void );
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ static __inline__ void ide_release_lock (void)
|
|||
}
|
||||
|
||||
static __inline__ void
|
||||
ide_get_lock(irqreturn_t (*handler)(int, void *), void *data)
|
||||
ide_get_lock(irq_handler_t handler, void *data)
|
||||
{
|
||||
if (MACH_IS_ATARI) {
|
||||
if (falconide_intr_lock == 0) {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ struct rtc_time;
|
|||
struct rtc_pll_info;
|
||||
struct buffer_head;
|
||||
|
||||
extern void (*mach_sched_init) (irqreturn_t (*handler)(int, void *));
|
||||
extern void (*mach_sched_init) (irq_handler_t handler);
|
||||
/* machine dependent irq functions */
|
||||
extern void (*mach_init_IRQ) (void);
|
||||
extern void (*mach_get_model) (char *model);
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ struct dma_chan {
|
|||
extern struct dma_chan au1000_dma_table[];
|
||||
extern 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);
|
||||
extern void free_au1000_dma(unsigned int dmanr);
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ void ibmebus_unregister_driver(struct ibmebus_driver *drv);
|
|||
|
||||
int ibmebus_request_irq(struct ibmebus_dev *dev,
|
||||
u32 ist,
|
||||
irqreturn_t (*handler)(int, void*),
|
||||
irq_handler_t handler,
|
||||
unsigned long irq_flags, const char * devname,
|
||||
void *dev_id);
|
||||
void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id);
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ static inline void load_profile_irq(int cpu, int limit)
|
|||
BTFIXUP_CALL(load_profile_irq)(cpu, limit);
|
||||
}
|
||||
|
||||
extern void (*sparc_init_timers)(irqreturn_t (*lvl10_irq)(int, void *));
|
||||
extern void claim_ticker14(irqreturn_t (*irq_handler)(int, void *),
|
||||
extern void (*sparc_init_timers)(irq_handler_t lvl10_irq);
|
||||
extern void claim_ticker14(irq_handler_t irq_handler,
|
||||
int irq,
|
||||
unsigned int timeout);
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ BTFIXUPDEF_CALL(void, set_irq_udt, int)
|
|||
#define set_irq_udt(cpu) BTFIXUP_CALL(set_irq_udt)(cpu)
|
||||
#endif
|
||||
|
||||
extern int request_fast_irq(unsigned int irq, irqreturn_t (*handler)(int, void *), unsigned long flags, __const__ char *devname);
|
||||
extern int request_fast_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, __const__ char *devname);
|
||||
|
||||
/* On the sun4m, just like the timers, we have both per-cpu and master
|
||||
* interrupt registers.
|
||||
|
|
|
|||
Loading…
Reference in a new issue