Commit 112766cd authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Bjorn Andersson
Browse files

rpmsg: glink: remove duplicate code for rpmsg device remove 



rpmsg device remove code is duplicated in at-least 2-3 places, add a
helper function to remove this duplicated code.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250822100043.2604794-3-srinivas.kandagatla@oss.qualcomm.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent a53e356d

drivers/rpmsg/qcom_glink_native.c

+16 −27
Original line number Diff line number Diff line
@@ -1395,11 +1395,23 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev) 
	return 0;

}



static void qcom_glink_remove_rpmsg_device(struct qcom_glink *glink, struct glink_channel *channel)

{

	struct rpmsg_channel_info chinfo;



	if (channel->rpdev) {

		strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;

		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

}



static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)

{

	struct glink_channel *channel = to_glink_channel(ept);

	struct qcom_glink *glink = channel->glink;

	struct rpmsg_channel_info chinfo;

	unsigned long flags;



	spin_lock_irqsave(&channel->recv_lock, flags);
@@ -1407,14 +1419,7 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept) 
	spin_unlock_irqrestore(&channel->recv_lock, flags);



	/* Decouple the potential rpdev from the channel */

	if (channel->rpdev) {

		strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;



		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	qcom_glink_send_close_req(glink, channel);

}
@@ -1705,7 +1710,6 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, 


static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)

{

	struct rpmsg_channel_info chinfo;

	struct glink_channel *channel;

	unsigned long flags;
@@ -1721,14 +1725,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid) 
	/* cancel pending rx_done work */

	cancel_work_sync(&channel->intent_work);



	if (channel->rpdev) {

		strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;



		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	qcom_glink_send_close_ack(glink, channel);
@@ -1742,7 +1739,6 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid) 


static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid)

{

	struct rpmsg_channel_info chinfo;

	struct glink_channel *channel;

	unsigned long flags;
@@ -1764,14 +1760,7 @@ static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid) 
	spin_unlock_irqrestore(&glink->idr_lock, flags);



	/* Decouple the potential rpdev from the channel */

	if (channel->rpdev) {

		strscpy(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;



		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	kref_put(&channel->refcount, qcom_glink_channel_release);

}