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

Commit 98a1e95f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-cleanups-upstream' of... 

Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] minor irq handler cleanups
  drivers/char: minor irq handler cleanups
  [PPC] minor irq handler cleanups
  [BLACKFIN] minor irq handler cleanups
  [SPARC] minor irq handler cleanups
  ARM minor irq handler cleanup: avoid passing unused info to irq
parents abe834c8 896c6fa1

arch/arm/mach-integrator/time.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id) 
	xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);



	ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED,

			  "rtc-pl030", dev);

			  "rtc-pl030", NULL);

	if (ret)

		goto map_out;

arch/blackfin/kernel/time.c

+2 −3
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
/* This is an NTP setting */

#define	TICK_SIZE (tick_nsec / 1000)



static void time_sched_init(irqreturn_t(*timer_routine)

			(int, void *));

static void time_sched_init(irq_handler_t timer_routine);

static unsigned long gettimeoffset(void);



static struct irqaction bfin_timer_irq = {
@@ -64,7 +63,7 @@ static struct irqaction bfin_timer_irq = { 
#define TIME_SCALE 1



static void

time_sched_init(irqreturn_t(*timer_routine) (int, void *))

time_sched_init(irq_handler_t timer_routine)

{

	u32 tcount;

arch/ppc/8xx_io/fec.c

+1 −2
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); 
#ifdef	CONFIG_USE_MDIO

static void fec_enet_mii(struct net_device *dev);

#endif	/* CONFIG_USE_MDIO */

static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);

#ifdef CONFIG_FEC_PACKETHOOK

static void  fec_enet_tx(struct net_device *dev, __u32 regval);

static void  fec_enet_rx(struct net_device *dev, __u32 regval);

arch/ppc/platforms/sbc82xx.c

+3 −1
Original line number Diff line number Diff line
@@ -121,8 +121,10 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { 
	.end = sbc82xx_i8259_end_irq,

};



static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id)

static irqreturn_t sbc82xx_i8259_demux(int dummy, void *dev_id)

{

	int irq;



	spin_lock(&sbc82xx_i8259_lock);



	sbc82xx_i8259_map[0] = 0x0c;	/* OCW3: Read IR register on RD# pulse */

arch/sparc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ __volatile__ unsigned int *master_l10_limit; 


#define TICK_SIZE (tick_nsec / 1000)



irqreturn_t timer_interrupt(int irq, void *dev_id)

static irqreturn_t timer_interrupt(int dummy, void *dev_id)

{

	/* last time the cmos clock got updated */

	static long last_rtc_update;