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

Commit 691f8f87 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

clocksource/drivers/h8300_timer8: 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>
parent eacf2091

drivers/clocksource/h8300_timer8.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -164,24 +164,26 @@ static struct timer8_priv timer8_priv = { 
	},

	},

};

};





static void __init h8300_8timer_init(struct device_node *node)

static int __init h8300_8timer_init(struct device_node *node)

{

{

	void __iomem *base;

	void __iomem *base;

	int irq;

	int irq, ret;

	struct clk *clk;

	struct clk *clk;





	clk = of_clk_get(node, 0);

	clk = of_clk_get(node, 0);

	if (IS_ERR(clk)) {

	if (IS_ERR(clk)) {

		pr_err("failed to get clock for clockevent\n");

		pr_err("failed to get clock for clockevent\n");

		return;

		return PTR_ERR(clk);

	}

	}





	ret = ENXIO;

	base = of_iomap(node, 0);

	base = of_iomap(node, 0);

	if (!base) {

	if (!base) {

		pr_err("failed to map registers for clockevent\n");

		pr_err("failed to map registers for clockevent\n");

		goto free_clk;

		goto free_clk;

	}

	}





	ret = -EINVAL;

	irq = irq_of_parse_and_map(node, 0);

	irq = irq_of_parse_and_map(node, 0);

	if (!irq) {

	if (!irq) {

		pr_err("failed to get irq for clockevent\n");

		pr_err("failed to get irq for clockevent\n");
@@ -205,11 +207,12 @@ static void __init h8300_8timer_init(struct device_node *node) 
	clockevents_config_and_register(&timer8_priv.ced,

	clockevents_config_and_register(&timer8_priv.ced,

					timer8_priv.rate, 1, 0x0000ffff);

					timer8_priv.rate, 1, 0x0000ffff);





	return;

	return 0;

unmap_reg:

unmap_reg:

	iounmap(base);

	iounmap(base);

free_clk:

free_clk:

	clk_put(clk);

	clk_put(clk);

	return ret;

}

}





CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init);
 
CLOCKSOURCE_OF_DECLARE_RET(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init);