rpmsg: qcom: smd: Return positively when not enabled

andersson · andersson · commit 88e30752dd47 · 2017-02-06T13:49:29.000-08:00
Remoteproc treats the error codes returned from the stubbed SMD API as
errors, but the fact that SMD is not enabled should not affect
remoteproc's ability to start the remote processors.

Signed-off-by: Bjorn Andersson &lt;bjorn.andersson@linaro.org&gt;
diff --git a/include/linux/rpmsg/qcom_smd.h b/include/linux/rpmsg/qcom_smd.h
@@ -18,14 +18,12 @@ static inline struct qcom_smd_edge *
 qcom_smd_register_edge(struct device *parent,
 		       struct device_node *node)
 {
-	return ERR_PTR(-ENXIO);
+	return NULL;
 }
 
 static inline int qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
 {
-	/* This shouldn't be possible */
-	WARN_ON(1);
-	return -ENXIO;
+	return 0;
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,12 @@ static inline struct qcom_smd_edge *`
`18`	`18`	`qcom_smd_register_edge(struct device *parent,`
`19`	`19`	`struct device_node *node)`
`20`	`20`	`{`
`21`		`- return ERR_PTR(-ENXIO);`
	`21`	`+ return NULL;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`static inline int qcom_smd_unregister_edge(struct qcom_smd_edge *edge)`
`25`	`25`	`{`
`26`		`- /* This shouldn't be possible */`
`27`		`- WARN_ON(1);`
`28`		`- return -ENXIO;`
	`26`	`+ return 0;`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`#endif`