Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6014ce85 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes 

Reset controller fixes for v4.11

Fix optional reset_control_get_stubs to return NULL and remove warnings
from reset_control_* stubs.
This fixes commit bb475230 ("reset: make optional  functions really
optional"), which was merged in reset-for-4.11, and would cause consumer
drivers depending on the new behaviour of optional resets to fail probing
if RESET_CONTROLLER Kconfig option is disabled.

* tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux

:
  reset: fix optional reset_control_get stubs to return NULL

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2b259300 0ca10b60

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 */