forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Daniel Lezcano 2016-06-06 17:58:43 +02:00
parent be3aff842d
commit ab51189ca4
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/clocksource/qcom-timer.c
View file

@ -178,7 +178,7 @@ static struct delay_timer msm_delay_timer = {
.read_current_timer = msm_read_current_timer, .read_current_timer = msm_read_current_timer,
}; };
static void __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq, static int __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq,
bool percpu) bool percpu)
{ {
struct clocksource *cs = &msm_clocksource; struct clocksource *cs = &msm_clocksource;
@ -218,12 +218,14 @@ err:
sched_clock_register(msm_sched_clock_read, sched_bits, dgt_hz); sched_clock_register(msm_sched_clock_read, sched_bits, dgt_hz);
msm_delay_timer.freq = dgt_hz; msm_delay_timer.freq = dgt_hz;
register_current_timer_delay(&msm_delay_timer); register_current_timer_delay(&msm_delay_timer);
return res;
} }
static void __init msm_dt_timer_init(struct device_node *np) static int __init msm_dt_timer_init(struct device_node *np)
{ {
u32 freq; u32 freq;
int irq; int irq, ret;
struct resource res; struct resource res;
u32 percpu_offset; u32 percpu_offset;
void __iomem *base; void __iomem *base;
@ -232,34 +234,35 @@ static void __init msm_dt_timer_init(struct device_node *np)
base = of_iomap(np, 0); base = of_iomap(np, 0);
if (!base) { if (!base) {
pr_err("Failed to map event base\n"); pr_err("Failed to map event base\n");
return; return -ENXIO;
} }
/* We use GPT0 for the clockevent */ /* We use GPT0 for the clockevent */
irq = irq_of_parse_and_map(np, 1); irq = irq_of_parse_and_map(np, 1);
if (irq <= 0) { if (irq <= 0) {
pr_err("Can't get irq\n"); pr_err("Can't get irq\n");
return; return -EINVAL;
} }
/* We use CPU0's DGT for the clocksource */ /* We use CPU0's DGT for the clocksource */
if (of_property_read_u32(np, "cpu-offset", &percpu_offset)) if (of_property_read_u32(np, "cpu-offset", &percpu_offset))
percpu_offset = 0; percpu_offset = 0;
if (of_address_to_resource(np, 0, &res)) { ret = of_address_to_resource(np, 0, &res);
if (ret) {
pr_err("Failed to parse DGT resource\n"); pr_err("Failed to parse DGT resource\n");
return; return ret;
} }
cpu0_base = ioremap(res.start + percpu_offset, resource_size(&res)); cpu0_base = ioremap(res.start + percpu_offset, resource_size(&res));
if (!cpu0_base) { if (!cpu0_base) {
pr_err("Failed to map source base\n"); pr_err("Failed to map source base\n");
return; return -EINVAL;
} }
if (of_property_read_u32(np, "clock-frequency", &freq)) { if (of_property_read_u32(np, "clock-frequency", &freq)) {
pr_err("Unknown frequency\n"); pr_err("Unknown frequency\n");
return; return -EINVAL;
} }
event_base = base + 0x4; event_base = base + 0x4;
@ -268,7 +271,7 @@ static void __init msm_dt_timer_init(struct device_node *np)
freq /= 4; freq /= 4;
writel_relaxed(DGT_CLK_CTL_DIV_4, source_base + DGT_CLK_CTL); writel_relaxed(DGT_CLK_CTL_DIV_4, source_base + DGT_CLK_CTL);
msm_timer_init(freq, 32, irq, !!percpu_offset); return msm_timer_init(freq, 32, irq, !!percpu_offset);
} }
CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); CLOCKSOURCE_OF_DECLARE_RET(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); CLOCKSOURCE_OF_DECLARE_RET(scss_timer, "qcom,scss-timer", msm_dt_timer_init);