projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod.c
b/arch/arm/mach-omap2/omap_hwmod.c
index 9e91a4e7519a63709ea38056373491f2665c8327..faa65833a0d44c08197f0b699c51766dacb19745 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod.c
+++ b/
arch/arm/mach-omap2/omap_hwmod.c
@@
-769,8
+769,8
@@
static int _init_main_clk(struct omap_hwmod *oh)
oh->_clk = clk_get(NULL, oh->main_clk);
if (IS_ERR(oh->_clk)) {
oh->_clk = clk_get(NULL, oh->main_clk);
if (IS_ERR(oh->_clk)) {
- pr_warn
ing
("omap_hwmod: %s: cannot clk_get main_clk %s\n",
-
oh->name, oh->main_clk);
+ pr_warn("omap_hwmod: %s: cannot clk_get main_clk %s\n",
+ oh->name, oh->main_clk);
return -EINVAL;
}
/*
return -EINVAL;
}
/*
@@
-814,8
+814,8
@@
static int _init_interface_clks(struct omap_hwmod *oh)
c = clk_get(NULL, os->clk);
if (IS_ERR(c)) {
c = clk_get(NULL, os->clk);
if (IS_ERR(c)) {
- pr_warn
ing
("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
-
oh->name, os->clk);
+ pr_warn("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
+ oh->name, os->clk);
ret = -EINVAL;
continue;
}
ret = -EINVAL;
continue;
}
@@
-851,8
+851,8
@@
static int _init_opt_clks(struct omap_hwmod *oh)
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
c = clk_get(NULL, oc->clk);
if (IS_ERR(c)) {
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
c = clk_get(NULL, oc->clk);
if (IS_ERR(c)) {
- pr_warn
ing
("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
-
oh->name, oc->clk);
+ pr_warn("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
+ oh->name, oc->clk);
ret = -EINVAL;
continue;
}
ret = -EINVAL;
continue;
}
@@
-1576,7
+1576,7
@@
static int _init_clkdm(struct omap_hwmod *oh)
oh->clkdm = clkdm_lookup(oh->clkdm_name);
if (!oh->clkdm) {
oh->clkdm = clkdm_lookup(oh->clkdm_name);
if (!oh->clkdm) {
- pr_warn
ing
("omap_hwmod: %s: could not associate to clkdm %s\n",
+ pr_warn("omap_hwmod: %s: could not associate to clkdm %s\n",
oh->name, oh->clkdm_name);
return 0;
}
oh->name, oh->clkdm_name);
return 0;
}
@@
-1616,7
+1616,7
@@
static int _init_clocks(struct omap_hwmod *oh, void *data)
if (!ret)
oh->_state = _HWMOD_STATE_CLKS_INITED;
else
if (!ret)
oh->_state = _HWMOD_STATE_CLKS_INITED;
else
- pr_warn
ing
("omap_hwmod: %s: cannot _init_clocks\n", oh->name);
+ pr_warn("omap_hwmod: %s: cannot _init_clocks\n", oh->name);
return ret;
}
return ret;
}
@@
-1739,7
+1739,7
@@
static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
_disable_clocks(oh);
if (ret == -EBUSY)
_disable_clocks(oh);
if (ret == -EBUSY)
- pr_warn
ing
("omap_hwmod: %s: failed to hardreset\n", oh->name);
+ pr_warn("omap_hwmod: %s: failed to hardreset\n", oh->name);
if (!ret) {
/*
if (!ret) {
/*
@@
-1953,8
+1953,8
@@
static int _ocp_softreset(struct omap_hwmod *oh)
c = _wait_softreset_complete(oh);
if (c == MAX_MODULE_SOFTRESET_WAIT) {
c = _wait_softreset_complete(oh);
if (c == MAX_MODULE_SOFTRESET_WAIT) {
- pr_warn
ing
("omap_hwmod: %s: softreset failed (waited %d usec)\n",
-
oh->name, MAX_MODULE_SOFTRESET_WAIT);
+ pr_warn("omap_hwmod: %s: softreset failed (waited %d usec)\n",
+ oh->name, MAX_MODULE_SOFTRESET_WAIT);
ret = -ETIMEDOUT;
goto dis_opt_clks;
} else {
ret = -ETIMEDOUT;
goto dis_opt_clks;
} else {
@@
-2618,8
+2618,8
@@
static int __init _setup_reset(struct omap_hwmod *oh)
if (oh->rst_lines_cnt == 0) {
r = _enable(oh);
if (r) {
if (oh->rst_lines_cnt == 0) {
r = _enable(oh);
if (r) {
- pr_warn
ing
("omap_hwmod: %s: cannot be enabled for reset (%d)\n",
-
oh->name, oh->_state);
+ pr_warn("omap_hwmod: %s: cannot be enabled for reset (%d)\n",
+ oh->name, oh->_state);
return -EINVAL;
}
}
return -EINVAL;
}
}