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

Commit 59519774 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

clocksource/drivers/bcm_kona: Convert init function to return error 



The init functions do not return any error. They behave as the following:

  - panic, thus leading to a kernel crash while another timer may work and
       make the system boot up correctly

  or

  - print an error and let the caller unaware if the state of the system

Change that by converting the init functions to return an error conforming
to the CLOCKSOURCE_OF_RET prototype.

Proper error handling (rollback, errno value) will be changed later case
by case, thus this change just return back an error or success in the init
function.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>
parent 524a7f08

drivers/clocksource/bcm_kona_timer.c

+6 −9
Original line number Diff line number Diff line
@@ -163,16 +163,11 @@ static struct irqaction kona_timer_irq = { 
	.handler = kona_timer_interrupt,

};



static void __init kona_timer_init(struct device_node *node)

static int __init kona_timer_init(struct device_node *node)

{

	u32 freq;

	struct clk *external_clk;



	if (!of_device_is_available(node)) {

		pr_info("Kona Timer v1 marked as disabled in device tree\n");

		return;

	}



	external_clk = of_clk_get_by_name(node, NULL);



	if (!IS_ERR(external_clk)) {
@@ -182,7 +177,7 @@ static void __init kona_timer_init(struct device_node *node) 
		arch_timer_rate = freq;

	} else {

		pr_err("Kona Timer v1 unable to determine clock-frequency");

		return;

		return -EINVAL;

	}



	/* Setup IRQ numbers */
@@ -196,11 +191,13 @@ static void __init kona_timer_init(struct device_node *node) 
	kona_timer_clockevents_init();

	setup_irq(timers.tmr_irq, &kona_timer_irq);

	kona_timer_set_next_event((arch_timer_rate / HZ), NULL);



	return 0;

}



CLOCKSOURCE_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init);

CLOCKSOURCE_OF_DECLARE_RET(brcm_kona, "brcm,kona-timer", kona_timer_init);

/*

 * bcm,kona-timer is deprecated by brcm,kona-timer

 * being kept here for driver compatibility

 */

CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
 
CLOCKSOURCE_OF_DECLARE_RET(bcm_kona, "bcm,kona-timer", kona_timer_init);