reset: fix optional reset_control_get stubs to return NULL (0ca10b60) · Commits · 戴 / test

When RESET_CONTROLLER is not enabled, the optional reset_control_get stubs should now also return NULL. Since it is now valid for reset_control_assert/deassert/reset/status/put to be called unconditionally, with NULL as an argument for optional resets, the stubs are not allowed to warn anymore. Fixes: ("reset: make optional functions really optional") Reported-by:

Andrzej Hajda <a.hajda@samsung.com> Tested-by:

Andrzej Hajda <a.hajda@samsung.com> Reviewed-by:

Andrzej Hajda <a.hajda@samsung.com> Cc: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com> Signed-off-by:

Philipp Zabel <p.zabel@pengutronix.de>

include/linux/reset.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev)

		static inline int reset_control_reset(struct reset_control *rstc)
		{
		WARN_ON(1);
		return 0;
		}

		static inline int reset_control_assert(struct reset_control *rstc)
		{
		WARN_ON(1);
		return 0;
		}

		static inline int reset_control_deassert(struct reset_control *rstc)
		{
		WARN_ON(1);
		return 0;
		}

		static inline int reset_control_status(struct reset_control *rstc)
		{
		WARN_ON(1);
		return 0;
		}

		static inline void reset_control_put(struct reset_control *rstc)
		{
		WARN_ON(1);
		}

		static inline int __must_check device_reset(struct device *dev)
		@@ -74,14 +69,14 @@ static inline struct reset_control *__of_reset_control_get(
		const char *id, int index, bool shared,
		bool optional)
		{
		return ERR_PTR(-ENOTSUPP);
		return optional ? NULL : ERR_PTR(-ENOTSUPP);
		}

		static inline struct reset_control *__devm_reset_control_get(
		struct device dev, const char id,
		int index, bool shared, bool optional)
		{
		return ERR_PTR(-ENOTSUPP);
		return optional ? NULL : ERR_PTR(-ENOTSUPP);
		}

		#endif /* CONFIG_RESET_CONTROLLER */

Admin message