Skip to content

Commit 810c03d

Browse files
Uwe Kleine-Königandersson
authored andcommitted
rpmsg: qcom_smd: Make qcom_smd_unregister_edge() return void
This function returned zero unconditionally. Convert it to return no value instead. This makes it more obvious what happens in the callers. One caller is converted to return zero explicitly. The only other caller (smd_subdev_stop() in drivers/remoteproc/qcom_common.c) already ignored the return value before. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230321154039.355098-2-u.kleine-koenig@pengutronix.de
1 parent fe15c26 commit 810c03d

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

drivers/rpmsg/qcom_smd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ static int qcom_smd_remove_device(struct device *dev, void *data)
15331533
* qcom_smd_unregister_edge() - release an edge and its children
15341534
* @edge: edge reference acquired from qcom_smd_register_edge
15351535
*/
1536-
int qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
1536+
void qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
15371537
{
15381538
int ret;
15391539

@@ -1547,8 +1547,6 @@ int qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
15471547

15481548
mbox_free_channel(edge->mbox_chan);
15491549
device_unregister(&edge->dev);
1550-
1551-
return 0;
15521550
}
15531551
EXPORT_SYMBOL(qcom_smd_unregister_edge);
15541552

@@ -1572,7 +1570,9 @@ static int qcom_smd_remove_edge(struct device *dev, void *data)
15721570
{
15731571
struct qcom_smd_edge *edge = to_smd_edge(dev);
15741572

1575-
return qcom_smd_unregister_edge(edge);
1573+
qcom_smd_unregister_edge(edge);
1574+
1575+
return 0;
15761576
}
15771577

15781578
/*

include/linux/rpmsg/qcom_smd.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct qcom_smd_edge;
1111

1212
struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent,
1313
struct device_node *node);
14-
int qcom_smd_unregister_edge(struct qcom_smd_edge *edge);
14+
void qcom_smd_unregister_edge(struct qcom_smd_edge *edge);
1515

1616
#else
1717

@@ -22,9 +22,8 @@ qcom_smd_register_edge(struct device *parent,
2222
return NULL;
2323
}
2424

25-
static inline int qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
25+
static inline void qcom_smd_unregister_edge(struct qcom_smd_edge *edge)
2626
{
27-
return 0;
2827
}
2928

3029
#endif

0 commit comments

Comments
 (0)