nvmem: use EOPNOTSUPP instead of ENOSYS

brgl · gregkh · commit 20167b70c894 · 2018-09-28T15:14:55.000+02:00
Checkpatch emits warnings when using ENOSYS. Some of the frameworks
started using EOPNOTSUPP as return values for API functions when given
subsystem is disabled in Kconfig.

Signed-off-by: Bartosz Golaszewski &lt;bgolaszewski@baylibre.com&gt;
Signed-off-by: Srinivas Kandagatla &lt;srinivas.kandagatla@linaro.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
@@ -93,13 +93,13 @@ int nvmem_unregister_notifier(struct notifier_block *nb);
 static inline struct nvmem_cell *nvmem_cell_get(struct device *dev,
 						const char *id)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline struct nvmem_cell *devm_nvmem_cell_get(struct device *dev,
 						     const char *id)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline void devm_nvmem_cell_put(struct device *dev,
@@ -113,31 +113,31 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)
 
 static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline int nvmem_cell_write(struct nvmem_cell *cell,
 				    const char *buf, size_t len)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_cell_read_u32(struct device *dev,
 				      const char *cell_id, u32 *val)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline struct nvmem_device *nvmem_device_get(struct device *dev,
 						    const char *name)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline struct nvmem_device *devm_nvmem_device_get(struct device *dev,
 							 const char *name)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline void nvmem_device_put(struct nvmem_device *nvmem)
@@ -153,28 +153,28 @@ static inline ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem,
 					 struct nvmem_cell_info *info,
 					 void *buf)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_device_cell_write(struct nvmem_device *nvmem,
 					  struct nvmem_cell_info *info,
 					  void *buf)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_device_read(struct nvmem_device *nvmem,
 				    unsigned int offset, size_t bytes,
 				    void *buf)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_device_write(struct nvmem_device *nvmem,
 				     unsigned int offset, size_t bytes,
 				     void *buf)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline const char *nvmem_dev_name(struct nvmem_device *nvmem)
@@ -189,12 +189,12 @@ nvmem_del_cell_lookups(struct nvmem_cell_lookup *entries, size_t nentries) {}
 
 static inline int nvmem_register_notifier(struct notifier_block *nb)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_unregister_notifier(struct notifier_block *nb)
 {
-	return -ENOSYS;
+	return -EOPNOTSUPP;
 }
 
 #endif /* CONFIG_NVMEM */
@@ -208,13 +208,13 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np,
 static inline struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
 						   const char *id)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline struct nvmem_device *of_nvmem_device_get(struct device_node *np,
 						       const char *name)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 #endif /* CONFIG_NVMEM && CONFIG_OF */
 
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
@@ -100,7 +100,7 @@ void nvmem_del_cell_table(struct nvmem_cell_table *table);
 
 static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
 {
-	return ERR_PTR(-ENOSYS);
+	return ERR_PTR(-EOPNOTSUPP);
 }
 
 static inline void nvmem_unregister(struct nvmem_device *nvmem) {}
@@ -114,8 +114,7 @@ devm_nvmem_register(struct device *dev, const struct nvmem_config *c)
 static inline int
 devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem)
 {
-	return -ENOSYS;
-
+	return -EOPNOTSUPP;
 }
 
 static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {}

Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,13 @@ int nvmem_unregister_notifier(struct notifier_block *nb);`
`93`	`93`	`static inline struct nvmem_cell nvmem_cell_get(struct device dev,`
`94`	`94`	`const char *id)`
`95`	`95`	`{`
`96`		`- return ERR_PTR(-ENOSYS);`
	`96`	`+ return ERR_PTR(-EOPNOTSUPP);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`static inline struct nvmem_cell devm_nvmem_cell_get(struct device dev,`
`100`	`100`	`const char *id)`
`101`	`101`	`{`
`102`		`- return ERR_PTR(-ENOSYS);`
	`102`	`+ return ERR_PTR(-EOPNOTSUPP);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`static inline void devm_nvmem_cell_put(struct device *dev,`
`@@ -113,31 +113,31 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)`
`113`	`113`
`114`	`114`	`static inline void nvmem_cell_read(struct nvmem_cell cell, size_t *len)`
`115`	`115`	`{`
`116`		`- return ERR_PTR(-ENOSYS);`
	`116`	`+ return ERR_PTR(-EOPNOTSUPP);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`static inline int nvmem_cell_write(struct nvmem_cell *cell,`
`120`	`120`	`const char *buf, size_t len)`
`121`	`121`	`{`
`122`		`- return -ENOSYS;`
	`122`	`+ return -EOPNOTSUPP;`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`static inline int nvmem_cell_read_u32(struct device *dev,`
`126`	`126`	`const char cell_id, u32 val)`
`127`	`127`	`{`
`128`		`- return -ENOSYS;`
	`128`	`+ return -EOPNOTSUPP;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`static inline struct nvmem_device nvmem_device_get(struct device dev,`
`132`	`132`	`const char *name)`
`133`	`133`	`{`
`134`		`- return ERR_PTR(-ENOSYS);`
	`134`	`+ return ERR_PTR(-EOPNOTSUPP);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`static inline struct nvmem_device devm_nvmem_device_get(struct device dev,`
`138`	`138`	`const char *name)`
`139`	`139`	`{`
`140`		`- return ERR_PTR(-ENOSYS);`
	`140`	`+ return ERR_PTR(-EOPNOTSUPP);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`static inline void nvmem_device_put(struct nvmem_device *nvmem)`
`@@ -153,28 +153,28 @@ static inline ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem,`
`153`	`153`	`struct nvmem_cell_info *info,`
`154`	`154`	`void *buf)`
`155`	`155`	`{`
`156`		`- return -ENOSYS;`
	`156`	`+ return -EOPNOTSUPP;`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`static inline int nvmem_device_cell_write(struct nvmem_device *nvmem,`
`160`	`160`	`struct nvmem_cell_info *info,`
`161`	`161`	`void *buf)`
`162`	`162`	`{`
`163`		`- return -ENOSYS;`
	`163`	`+ return -EOPNOTSUPP;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`static inline int nvmem_device_read(struct nvmem_device *nvmem,`
`167`	`167`	`unsigned int offset, size_t bytes,`
`168`	`168`	`void *buf)`
`169`	`169`	`{`
`170`		`- return -ENOSYS;`
	`170`	`+ return -EOPNOTSUPP;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`static inline int nvmem_device_write(struct nvmem_device *nvmem,`
`174`	`174`	`unsigned int offset, size_t bytes,`
`175`	`175`	`void *buf)`
`176`	`176`	`{`
`177`		`- return -ENOSYS;`
	`177`	`+ return -EOPNOTSUPP;`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`static inline const char nvmem_dev_name(struct nvmem_device nvmem)`
`@@ -189,12 +189,12 @@ nvmem_del_cell_lookups(struct nvmem_cell_lookup *entries, size_t nentries) {}`
`189`	`189`
`190`	`190`	`static inline int nvmem_register_notifier(struct notifier_block *nb)`
`191`	`191`	`{`
`192`		`- return -ENOSYS;`
	`192`	`+ return -EOPNOTSUPP;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`static inline int nvmem_unregister_notifier(struct notifier_block *nb)`
`196`	`196`	`{`
`197`		`- return -ENOSYS;`
	`197`	`+ return -EOPNOTSUPP;`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`#endif /* CONFIG_NVMEM */`
`@@ -208,13 +208,13 @@ struct nvmem_device of_nvmem_device_get(struct device_node np,`
`208`	`208`	`static inline struct nvmem_cell of_nvmem_cell_get(struct device_node np,`
`209`	`209`	`const char *id)`
`210`	`210`	`{`
`211`		`- return ERR_PTR(-ENOSYS);`
	`211`	`+ return ERR_PTR(-EOPNOTSUPP);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`static inline struct nvmem_device of_nvmem_device_get(struct device_node np,`
`215`	`215`	`const char *name)`
`216`	`216`	`{`
`217`		`- return ERR_PTR(-ENOSYS);`
	`217`	`+ return ERR_PTR(-EOPNOTSUPP);`
`218`	`218`	`}`
`219`	`219`	`#endif /* CONFIG_NVMEM && CONFIG_OF */`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ void nvmem_del_cell_table(struct nvmem_cell_table *table);`
`100`	`100`
`101`	`101`	`static inline struct nvmem_device nvmem_register(const struct nvmem_config c)`
`102`	`102`	`{`
`103`		`- return ERR_PTR(-ENOSYS);`
	`103`	`+ return ERR_PTR(-EOPNOTSUPP);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`static inline void nvmem_unregister(struct nvmem_device *nvmem) {}`
`@@ -114,8 +114,7 @@ devm_nvmem_register(struct device dev, const struct nvmem_config c)`
`114`	`114`	`static inline int`
`115`	`115`	`devm_nvmem_unregister(struct device dev, struct nvmem_device nvmem)`
`116`	`116`	`{`
`117`		`- return -ENOSYS;`
`118`		`-`
	`117`	`+ return -EOPNOTSUPP;`
`119`	`118`	`}`
`120`	`119`
`121`	`120`	`static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {}`