Commit 3d2d10e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull rpmsg updates from Bjorn Andersson:
 "Mark 'data' argument in rpmsg_send() const, and perculate to related
  drivers. Replace deprecated class_destroy() with class_unregister()"

* tag 'rpmsg-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  media: platform: mtk-mdp3: Constify buffer passed to mdp_vpu_sendmsg()
  ASoC: qcom: Constify GPR packet being send over GPR interface
  rpmsg: Constify buffer passed to send API
  remoteproc: mtk_scp: Constify buffer passed to scp_send_ipi()
  remoteproc: mtk_scp_ipi: Constify buffer passed to scp_ipi_send()
  drivers: rpmsg: class_destroy() is deprecated
parents d65218de 3e2fa997

drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void mdp_vpu_unregister(struct mdp_dev *mdp) 
}



static int mdp_vpu_sendmsg(struct mdp_vpu_dev *vpu, enum scp_ipi_id id,

			   void *buf, unsigned int len)

			   const void *buf, unsigned int len)

{

	struct mdp_dev *mdp = vpu_to_mdp(vpu);

	unsigned int t = MDP_VPU_MESSAGE_TIMEOUT;

drivers/remoteproc/mtk_scp.c

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static void scp_unregister_ipi(struct platform_device *pdev, u32 id) 
	scp_ipi_unregister(scp, id);

}



static int scp_send_ipi(struct platform_device *pdev, u32 id, void *buf,

static int scp_send_ipi(struct platform_device *pdev, u32 id, const void *buf,

			unsigned int len, unsigned int wait)

{

	struct mtk_scp *scp = platform_get_drvdata(pdev);

drivers/remoteproc/mtk_scp_ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ EXPORT_SYMBOL_GPL(scp_ipi_unlock); 
 *

 * Return: 0 if sending data successfully, -error on error.

 **/

int scp_ipi_send(struct mtk_scp *scp, u32 id, void *buf, unsigned int len,

int scp_ipi_send(struct mtk_scp *scp, u32 id, const void *buf, unsigned int len,

		 unsigned int wait)

{

	struct mtk_share_obj __iomem *send_obj = scp->send_buf;

drivers/rpmsg/mtk_rpmsg.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void mtk_rpmsg_destroy_ept(struct rpmsg_endpoint *ept) 
	kref_put(&ept->refcount, __mtk_ept_release);

}



static int mtk_rpmsg_send(struct rpmsg_endpoint *ept, void *data, int len)

static int mtk_rpmsg_send(struct rpmsg_endpoint *ept, const void *data, int len)

{

	struct mtk_rpmsg_rproc_subdev *mtk_subdev =

		to_mtk_rpmsg_endpoint(ept)->mtk_subdev;
@@ -144,7 +144,7 @@ static int mtk_rpmsg_send(struct rpmsg_endpoint *ept, void *data, int len) 
					  len, 0);

}



static int mtk_rpmsg_trysend(struct rpmsg_endpoint *ept, void *data, int len)

static int mtk_rpmsg_trysend(struct rpmsg_endpoint *ept, const void *data, int len)

{

	struct mtk_rpmsg_rproc_subdev *mtk_subdev =

		to_mtk_rpmsg_endpoint(ept)->mtk_subdev;

drivers/rpmsg/qcom_glink_native.c

+8 −5
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ static int qcom_glink_request_intent(struct qcom_glink *glink, 
}



static int __qcom_glink_send(struct glink_channel *channel,

			     void *data, int len, bool wait)

			     const void *data, int len, bool wait)

{

	struct qcom_glink *glink = channel->glink;

	struct glink_core_rx_intent *intent = NULL;
@@ -1553,28 +1553,31 @@ static int __qcom_glink_send(struct glink_channel *channel, 
	return 0;

}



static int qcom_glink_send(struct rpmsg_endpoint *ept, void *data, int len)

static int qcom_glink_send(struct rpmsg_endpoint *ept, const void *data, int len)

{

	struct glink_channel *channel = to_glink_channel(ept);



	return __qcom_glink_send(channel, data, len, true);

}



static int qcom_glink_trysend(struct rpmsg_endpoint *ept, void *data, int len)

static int qcom_glink_trysend(struct rpmsg_endpoint *ept, const void *data,

			      int len)

{

	struct glink_channel *channel = to_glink_channel(ept);



	return __qcom_glink_send(channel, data, len, false);

}



static int qcom_glink_sendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dst)

static int qcom_glink_sendto(struct rpmsg_endpoint *ept, const void *data,

			     int len, u32 dst)

{

	struct glink_channel *channel = to_glink_channel(ept);



	return __qcom_glink_send(channel, data, len, true);

}



static int qcom_glink_trysendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dst)

static int qcom_glink_trysendto(struct rpmsg_endpoint *ept, const void *data,

				int len, u32 dst)

{

	struct glink_channel *channel = to_glink_channel(ept);