Since we now have dummy reset controllers we no longer need the
*_optional functions. These have been unused anyway, so just remove
them.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
include/linux/reset.h | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/include/linux/reset.h b/include/linux/reset.h
index f6c475c..3f810bd 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -15,17 +15,6 @@ void reset_control_put(struct reset_control *rstc);
int __must_check device_reset(struct device_d *dev);
-static inline int device_reset_optional(struct device_d *dev)
-{
- return device_reset(dev);
-}
-
-static inline struct reset_control *reset_control_get_optional(
- struct device_d *dev, const char *id)
-{
- return reset_control_get(dev, id);
-}
-
#else
static inline int reset_control_reset(struct reset_control *rstc)
@@ -51,17 +40,6 @@ static inline void reset_control_put(struct reset_control *rstc)
WARN_ON(1);
}
-static inline int device_reset_optional(struct device_d *dev)
-{
- return -ENOSYS;
-}
-
-static inline struct reset_control *reset_control_get_optional(
- struct device_d *dev, const char *id)
-{
- return ERR_PTR(-ENOSYS);
-}
-
#endif /* CONFIG_RESET_CONTROLLER */
#endif
--
2.6.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
