diff options
author | John Crispin <blogic@openwrt.org> | 2014-09-11 17:49:57 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-09-11 17:49:57 +0000 |
commit | 6dac0c08725283e256e867830fb204d004ac752c (patch) | |
tree | 9c8086343821d3106c770efd2e42e1959ad55cb8 /target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch | |
parent | 5af0ac95ab03fba96f9f8b4eabe8620b966ab217 (diff) | |
download | master-187ad058-6dac0c08725283e256e867830fb204d004ac752c.tar.gz master-187ad058-6dac0c08725283e256e867830fb204d004ac752c.tar.bz2 master-187ad058-6dac0c08725283e256e867830fb204d004ac752c.zip |
lantiq: update 3.14 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42476 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch b/target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch new file mode 100644 index 0000000000..9589baa169 --- /dev/null +++ b/target/linux/lantiq/patches-3.14/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch @@ -0,0 +1,112 @@ +From b1b9fca8c317afc3f2b78bb54f877e8a830a819d Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 9 Aug 2013 18:47:27 +0200 +Subject: [PATCH 34/36] reset: Fix compile when reset RESET_CONTROLLER is not + selected + +Drivers need to protect their reset api calls with #ifdef to avoid compile +errors. + +This patch adds dummy wrappers in the same way that linux/of.h does it. + +Cc: linux-kernel@vger.kernel.org +Cc: Philipp Zabel <p.zabel@pengutronix.de> +Cc: Gabor Juhos <juhosg@openwrt.org> +--- + include/linux/reset-controller.h | 16 ++++++++++++++ + include/linux/reset.h | 43 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+) + +diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h +index 41a4695..f38f530 100644 +--- a/include/linux/reset-controller.h ++++ b/include/linux/reset-controller.h +@@ -46,7 +46,23 @@ struct reset_controller_dev { + unsigned int nr_resets; + }; + ++#if defined(CONFIG_RESET_CONTROLLER) ++ + int reset_controller_register(struct reset_controller_dev *rcdev); + void reset_controller_unregister(struct reset_controller_dev *rcdev); + ++#else ++ ++static inline int reset_controller_register(struct reset_controller_dev *rcdev) ++{ ++ return -ENOSYS; ++} ++ ++void reset_controller_unregister(struct reset_controller_dev *rcdev) ++{ ++ ++} ++ ++#endif ++ + #endif +diff --git a/include/linux/reset.h b/include/linux/reset.h +index 6082247..1b36c9e 100644 +--- a/include/linux/reset.h ++++ b/include/linux/reset.h +@@ -1,9 +1,13 @@ + #ifndef _LINUX_RESET_H_ + #define _LINUX_RESET_H_ + ++#include <linux/err.h> ++ + struct device; + struct reset_control; + ++#if defined(CONFIG_RESET_CONTROLLER) ++ + int reset_control_reset(struct reset_control *rstc); + int reset_control_assert(struct reset_control *rstc); + int reset_control_deassert(struct reset_control *rstc); +@@ -14,4 +18,43 @@ struct reset_control *devm_reset_control_get(struct device *dev, const char *id) + + int device_reset(struct device *dev); + ++#else /* CONFIG_RESET_CONTROLLER */ ++ ++static inline int reset_control_reset(struct reset_control *rstc) ++{ ++ return -ENOSYS; ++} ++ ++static inline int reset_control_assert(struct reset_control *rstc) ++{ ++ return -ENOSYS; ++} ++ ++static inline int reset_control_deassert(struct reset_control *rstc) ++{ ++ return -ENOSYS; ++} ++ ++static inline struct reset_control *reset_control_get(struct device *dev, const char *id) ++{ ++ return ERR_PTR(-ENOSYS); ++} ++ ++static inline void reset_control_put(struct reset_control *rstc) ++{ ++ ++} ++ ++static inline struct reset_control *devm_reset_control_get(struct device *dev, const char *id) ++{ ++ return ERR_PTR(-ENOSYS); ++} ++ ++static inline int device_reset(struct device *dev) ++{ ++ return -ENOSYS; ++} ++ ++#endif ++ + #endif +-- +1.7.10.4 + |