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

olofj · olofj · commit 6014ce855993 · 2017-03-21T17:30:51.000-07:00
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 bb47523 ("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: Olof Johansson <olof@lixom.net>
diff --git a/include/linux/reset.h b/include/linux/reset.h
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev)`
`31`	`31`
`32`	`32`	`static inline int reset_control_reset(struct reset_control *rstc)`
`33`	`33`	`{`
`34`		`- WARN_ON(1);`
`35`	`34`	`return 0;`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`static inline int reset_control_assert(struct reset_control *rstc)`
`39`	`38`	`{`
`40`		`- WARN_ON(1);`
`41`	`39`	`return 0;`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`static inline int reset_control_deassert(struct reset_control *rstc)`
`45`	`43`	`{`
`46`		`- WARN_ON(1);`
`47`	`44`	`return 0;`
`48`	`45`	`}`
`49`	`46`
`50`	`47`	`static inline int reset_control_status(struct reset_control *rstc)`
`51`	`48`	`{`
`52`		`- WARN_ON(1);`
`53`	`49`	`return 0;`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`static inline void reset_control_put(struct reset_control *rstc)`
`57`	`53`	`{`
`58`		`- WARN_ON(1);`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`static inline int __must_check device_reset(struct device *dev)`
`@@ -74,14 +69,14 @@ static inline struct reset_control *__of_reset_control_get(`
`74`	`69`	`const char *id, int index, bool shared,`
`75`	`70`	`bool optional)`
`76`	`71`	`{`
`77`		`- return ERR_PTR(-ENOTSUPP);`
	`72`	`+ return optional ? NULL : ERR_PTR(-ENOTSUPP);`
`78`	`73`	`}`
`79`	`74`
`80`	`75`	`static inline struct reset_control *__devm_reset_control_get(`
`81`	`76`	`struct device dev, const char id,`
`82`	`77`	`int index, bool shared, bool optional)`
`83`	`78`	`{`
`84`		`- return ERR_PTR(-ENOTSUPP);`
	`79`	`+ return optional ? NULL : ERR_PTR(-ENOTSUPP);`
`85`	`80`	`}`
`86`	`81`
`87`	`82`	`#endif /* CONFIG_RESET_CONTROLLER */`