Commit cc2550b4 authored by afzal mohammed's avatar afzal mohammed Committed by Daniel Lezcano
Browse files

clocksource: Replace setup_irq() by request_irq() 

request_irq() is preferred over setup_irq(). The early boot setup_irq()
invocations happen either via 'init_IRQ()' or 'time_init()', while
memory allocators are ready by 'mm_init()'.

Per tglx[1], setup_irq() existed in olden days when allocators were not
ready by the time early interrupts were initialized.

Hence replace setup_irq() by request_irq().

Seldom remove_irq() usage has been observed coupled with setup_irq(),
wherever that has been found, it too has been replaced by free_irq().

A build error that was reported by kbuild test robot <lkp@intel.com>
in the previous version of the patch also has been fixed.

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos



Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/91961c77c1cf93d41523f5e1ac52043f32f97077.1582799709.git.afzal.mohd.ma@gmail.com
parent a7cd3955

drivers/clocksource/bcm2835_timer.c

+2 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct bcm2835_timer { 
	void __iomem *compare;

	int match_mask;

	struct clock_event_device evt;

	struct irqaction act;

};



static void __iomem *system_clock __read_mostly;
@@ -113,12 +112,9 @@ static int __init bcm2835_timer_init(struct device_node *node) 
	timer->evt.features = CLOCK_EVT_FEAT_ONESHOT;

	timer->evt.set_next_event = bcm2835_time_set_next_event;

	timer->evt.cpumask = cpumask_of(0);

	timer->act.name = node->name;

	timer->act.flags = IRQF_TIMER | IRQF_SHARED;

	timer->act.dev_id = timer;

	timer->act.handler = bcm2835_time_interrupt;



	ret = setup_irq(irq, &timer->act);

	ret = request_irq(irq, bcm2835_time_interrupt, IRQF_TIMER | IRQF_SHARED,

			  node->name, timer);

	if (ret) {

		pr_err("Can't set up timer IRQ\n");

		goto err_timer_free;

drivers/clocksource/bcm_kona_timer.c

+3 −7
Original line number Diff line number Diff line
@@ -160,12 +160,6 @@ static irqreturn_t kona_timer_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static struct irqaction kona_timer_irq = {

	.name = "Kona Timer Tick",

	.flags = IRQF_TIMER,

	.handler = kona_timer_interrupt,

};



static int __init kona_timer_init(struct device_node *node)

{

	u32 freq;
@@ -192,7 +186,9 @@ static int __init kona_timer_init(struct device_node *node) 
	kona_timer_disable_and_clear(timers.tmr_regs);



	kona_timer_clockevents_init();

	setup_irq(timers.tmr_irq, &kona_timer_irq);

	if (request_irq(timers.tmr_irq, kona_timer_interrupt, IRQF_TIMER,

			"Kona Timer Tick", NULL))

		pr_err("%s: request_irq() failed\n", "Kona Timer Tick");

	kona_timer_set_next_event((arch_timer_rate / HZ), NULL);



	return 0;

drivers/clocksource/dw_apb_timer.c

+3 −8
Original line number Diff line number Diff line
@@ -270,15 +270,10 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, 
	dw_ced->ced.rating = rating;

	dw_ced->ced.name = name;



	dw_ced->irqaction.name		= dw_ced->ced.name;

	dw_ced->irqaction.handler	= dw_apb_clockevent_irq;

	dw_ced->irqaction.dev_id	= &dw_ced->ced;

	dw_ced->irqaction.irq		= irq;

	dw_ced->irqaction.flags		= IRQF_TIMER | IRQF_IRQPOLL |

					  IRQF_NOBALANCING;



	dw_ced->eoi = apbt_eoi;

	err = setup_irq(irq, &dw_ced->irqaction);

	err = request_irq(irq, dw_apb_clockevent_irq,

			  IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,

			  dw_ced->ced.name, &dw_ced->ced);

	if (err) {

		pr_err("failed to request timer irq\n");

		kfree(dw_ced);

drivers/clocksource/exynos_mct.c

+4 −8
Original line number Diff line number Diff line
@@ -329,19 +329,15 @@ static irqreturn_t exynos4_mct_comp_isr(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static struct irqaction mct_comp_event_irq = {

	.name		= "mct_comp_irq",

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= exynos4_mct_comp_isr,

	.dev_id		= &mct_comp_device,

};



static int exynos4_clockevent_init(void)

{

	mct_comp_device.cpumask = cpumask_of(0);

	clockevents_config_and_register(&mct_comp_device, clk_rate,

					0xf, 0xffffffff);

	setup_irq(mct_irqs[MCT_G0_IRQ], &mct_comp_event_irq);

	if (request_irq(mct_irqs[MCT_G0_IRQ], exynos4_mct_comp_isr,

			IRQF_TIMER | IRQF_IRQPOLL, "mct_comp_irq",

			&mct_comp_device))

		pr_err("%s: request_irq() failed\n", "mct_comp_irq");



	return 0;

}

drivers/clocksource/mxs_timer.c

+2 −8
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ static irqreturn_t mxs_timer_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static struct irqaction mxs_timer_irq = {

	.name		= "MXS Timer Tick",

	.dev_id		= &mxs_clockevent_device,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= mxs_timer_interrupt,

};



static void mxs_irq_clear(char *state)

{

	/* Disable interrupt in timer module */
@@ -277,6 +270,7 @@ static int __init mxs_timer_init(struct device_node *np) 
	if (irq <= 0)

		return -EINVAL;



	return setup_irq(irq, &mxs_timer_irq);

	return request_irq(irq, mxs_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL,

			   "MXS Timer Tick", &mxs_clockevent_device);

}

TIMER_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE