summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2013-07-14 21:35:49 +0800
committerNitin Garg <nitin.garg@freescale.com>2015-01-15 21:16:30 -0600
commitfc503208fc83ca05eb49256002da77f2d71c4056 (patch)
treeab13ed2b68b9cffbf3cb06ab8c24973056a6be76 /include
parent9db7838e60b38d3735f649018306362a17acc99f (diff)
ENGR00269945: reset: add dummy device_reset() for !CONFIG_RESET_CONTROLLER build
Add dummy device_reset() function for !CONFIG_RESET_CONTROLLER build, so that we do not have to add #ifdef CONFIG_RESET_CONTROLLER in every single client device drivers that call the function. [shawn.guo: cherry-pick commit a9c086f35277 from imx_3.10.y] Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/reset.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h
index 6082247feab1..2a8e982182f0 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -12,6 +12,13 @@ struct reset_control *reset_control_get(struct device *dev, const char *id);
void reset_control_put(struct reset_control *rstc);
struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
+#ifdef CONFIG_RESET_CONTROLLER
int device_reset(struct device *dev);
+#else
+static inline int device_reset(struct device *dev)
+{
+ return 0;
+}
+#endif /* CONFIG_RESET_CONTROLLER */
#endif