git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
[pandora-kernel.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
e512253
..
93f213b
100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod.c
+++ b/
arch/arm/mach-omap2/omap_hwmod.c
@@
-611,8
+611,6
@@
static int _enable_wakeup(struct omap_hwmod *oh, u32 *v)
/* XXX test pwrdm_get_wken for this hwmod's subsystem */
/* XXX test pwrdm_get_wken for this hwmod's subsystem */
- oh->_int_flags |= _HWMOD_WAKEUP_ENABLED;
-
return 0;
}
return 0;
}
@@
-646,8
+644,6
@@
static int _disable_wakeup(struct omap_hwmod *oh, u32 *v)
/* XXX test pwrdm_get_wken for this hwmod's subsystem */
/* XXX test pwrdm_get_wken for this hwmod's subsystem */
- oh->_int_flags &= ~_HWMOD_WAKEUP_ENABLED;
-
return 0;
}
return 0;
}
@@
-1667,7
+1663,7
@@
static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
return -ENOSYS;
ret = _lookup_hardreset(oh, name, &ohri);
return -ENOSYS;
ret = _lookup_hardreset(oh, name, &ohri);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
return ret;
if (oh->clkdm) {
return ret;
if (oh->clkdm) {
@@
-2417,7
+2413,7
@@
static int __init _init(struct omap_hwmod *oh, void *data)
_init_mpu_rt_base(oh, NULL);
r = _init_clocks(oh, NULL);
_init_mpu_rt_base(oh, NULL);
r = _init_clocks(oh, NULL);
- if (
IS_ERR_VALUE(r)
) {
+ if (
r < 0
) {
WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name);
return -EINVAL;
}
WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name);
return -EINVAL;
}