Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
drivers
/
base
/
power
/
clock_ops.c
diff --git
a/kernel/drivers/base/power/clock_ops.c
b/kernel/drivers/base/power/clock_ops.c
index
7fdd017
..
ac3c07d
100644
(file)
--- a/
kernel/drivers/base/power/clock_ops.c
+++ b/
kernel/drivers/base/power/clock_ops.c
@@
-37,7
+37,7
@@
struct pm_clock_entry {
* @dev: The device for the given clock
* @ce: PM clock entry corresponding to the clock.
*/
* @dev: The device for the given clock
* @ce: PM clock entry corresponding to the clock.
*/
-static inline
int
__pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
+static inline
void
__pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
{
int ret;
{
int ret;
@@
-49,8
+49,6
@@
static inline int __pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
dev_err(dev, "%s: failed to enable clk %p, error %d\n",
__func__, ce->clk, ret);
}
dev_err(dev, "%s: failed to enable clk %p, error %d\n",
__func__, ce->clk, ret);
}
-
- return ret;
}
/**
}
/**
@@
-93,7
+91,7
@@
static int __pm_clk_add(struct device *dev, const char *con_id,
return -ENOMEM;
}
} else {
return -ENOMEM;
}
} else {
- if (IS_ERR(c
e->c
lk) || !__clk_get(clk)) {
+ if (IS_ERR(clk) || !__clk_get(clk)) {
kfree(ce);
return -ENOENT;
}
kfree(ce);
return -ENOENT;
}