Skip to content

Commit

Permalink
PM / clock_ops: report clock errors from clk_enable()
Browse files Browse the repository at this point in the history
If clk_enable() fails, then print a message so that the user can see
what is happening instead of silently failing to enable the clock.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Ben Dooks authored and Rafael J. Wysocki committed Jan 15, 2014
1 parent afdd3ab commit 5cda3fb
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions drivers/base/power/clock_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ struct pm_clock_entry {
enum pce_status status;
};

/**
* pm_clk_enable - Enable a clock, reporting any errors
* @dev: The device for the given clock
* @clk: The clock being enabled.
*/
static inline int __pm_clk_enable(struct device *dev, struct clk *clk)
{
int ret = clk_enable(clk);
if (ret)
dev_err(dev, "%s: failed to enable clk %p, error %d\n",
__func__, clk, ret);

return ret;
}

/**
* pm_clk_acquire - Acquire a device clock.
* @dev: Device whose clock is to be acquired.
Expand Down Expand Up @@ -263,7 +278,7 @@ int pm_clk_resume(struct device *dev)

list_for_each_entry(ce, &psd->clock_list, node) {
if (ce->status < PCE_STATUS_ERROR) {
ret = clk_enable(ce->clk);
ret = __pm_clk_enable(dev, ce->clk);
if (!ret)
ce->status = PCE_STATUS_ENABLED;
}
Expand Down Expand Up @@ -381,7 +396,7 @@ int pm_clk_resume(struct device *dev)
spin_lock_irqsave(&psd->lock, flags);

list_for_each_entry(ce, &psd->clock_list, node)
clk_enable(ce->clk);
__pm_clk_enable(dev, ce->clk);

spin_unlock_irqrestore(&psd->lock, flags);

Expand Down

0 comments on commit 5cda3fb

Please sign in to comment.