Skip to content

Commit

Permalink
cpufreq: OMAP: deny initialization if no mpudev
Browse files Browse the repository at this point in the history
if we do not have mpu_dev we normally fail in cpu_init. It is better
to fail driver registration if the devices are not available.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Nishanth Menon authored and Kevin Hilman committed Nov 8, 2011
1 parent 08ca3e3 commit a820ffa
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/cpufreq/omap-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static struct lpj_info global_lpj_ref;
static struct cpufreq_frequency_table *freq_table;
static struct clk *mpu_clk;
static char *mpu_clk_name;
static struct device *mpu_dev;

static int omap_verify_speed(struct cpufreq_policy *policy)
{
Expand Down Expand Up @@ -152,7 +153,6 @@ static int omap_target(struct cpufreq_policy *policy,
static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
struct device *mpu_dev;

mpu_clk = clk_get(NULL, mpu_clk_name);
if (IS_ERR(mpu_clk))
Expand All @@ -162,12 +162,6 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
return -EINVAL;

policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
mpu_dev = omap2_get_mpuss_device();

if (!mpu_dev) {
pr_warning("%s: unable to get the mpu device\n", __func__);
return -EINVAL;
}
opp_init_cpufreq_table(mpu_dev, &freq_table);

if (freq_table) {
Expand Down Expand Up @@ -239,6 +233,13 @@ static int __init omap_cpufreq_init(void)
pr_err("%s: unsupported Silicon?\n", __func__);
return -EINVAL;
}

mpu_dev = omap2_get_mpuss_device();
if (!mpu_dev) {
pr_warning("%s: unable to get the mpu device\n", __func__);
return -EINVAL;
}

return cpufreq_register_driver(&omap_driver);
}

Expand Down

0 comments on commit a820ffa

Please sign in to comment.