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

Commit 44a10f94 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

clocksource: sh_cmt: Initialize 'max_match_value' and 'lock' in sh_cmt_setup() 



Move the setup of spinlock and max_match_value to sh_cmt_setup().
There's no need to defer those steps until sh_cmt_register().

Signed-off-by: default avatarShinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Tested-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 2fd61b32

drivers/clocksource/sh_cmt.c

+8 −8
Original line number Diff line number Diff line
@@ -625,14 +625,6 @@ static int sh_cmt_register(struct sh_cmt_priv *p, char *name, 
			   unsigned long clockevent_rating,

			   unsigned long clocksource_rating)

{

	if (p->width == (sizeof(p->max_match_value) * 8))

		p->max_match_value = ~0;

	else

		p->max_match_value = (1 << p->width) - 1;



	p->match_value = p->max_match_value;

	raw_spin_lock_init(&p->lock);



	if (clockevent_rating)

		sh_cmt_register_clockevent(p, name, clockevent_rating);
@@ -703,6 +695,14 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) 
		p->clear_bits = ~0xc000;

	}



	if (p->width == (sizeof(p->max_match_value) * 8))

		p->max_match_value = ~0;

	else

		p->max_match_value = (1 << p->width) - 1;



	p->match_value = p->max_match_value;

	raw_spin_lock_init(&p->lock);



	ret = sh_cmt_register(p, (char *)dev_name(&p->pdev->dev),

			      cfg->clockevent_rating,

			      cfg->clocksource_rating);