Commit 6f8b0373 authored by Alex Elder's avatar Alex Elder Committed by Bjorn Andersson
Browse files

remoteproc: rename subdev probe and remove functions 



Rename functions used when subdevices are started and stopped to
reflect the new naming scheme.

Tested-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Signed-off-by Alex Elder <elder@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 4902676f

drivers/remoteproc/qcom_common.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 




static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);

static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);





static int glink_subdev_probe(struct rproc_subdev *subdev)

static int glink_subdev_start(struct rproc_subdev *subdev)

{

{

	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
@@ -42,7 +42,7 @@ static int glink_subdev_probe(struct rproc_subdev *subdev) 
	return PTR_ERR_OR_ZERO(glink->edge);

	return PTR_ERR_OR_ZERO(glink->edge);

}

}





static void glink_subdev_remove(struct rproc_subdev *subdev, bool crashed)

static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)

{

{

	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
@@ -64,8 +64,8 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink) 
		return;

		return;





	glink->dev = dev;

	glink->dev = dev;

	glink->subdev.start = glink_subdev_probe;

	glink->subdev.start = glink_subdev_start;

	glink->subdev.stop = glink_subdev_remove;

	glink->subdev.stop = glink_subdev_stop;





	rproc_add_subdev(rproc, &glink->subdev);

	rproc_add_subdev(rproc, &glink->subdev);

}

}
@@ -129,7 +129,7 @@ int qcom_register_dump_segments(struct rproc *rproc, 
}

}

EXPORT_SYMBOL_GPL(qcom_register_dump_segments);

EXPORT_SYMBOL_GPL(qcom_register_dump_segments);





static int smd_subdev_probe(struct rproc_subdev *subdev)

static int smd_subdev_start(struct rproc_subdev *subdev)

{

{

	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
@@ -138,7 +138,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev) 
	return PTR_ERR_OR_ZERO(smd->edge);

	return PTR_ERR_OR_ZERO(smd->edge);

}

}





static void smd_subdev_remove(struct rproc_subdev *subdev, bool crashed)

static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)

{

{

	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
@@ -160,8 +160,8 @@ void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd) 
		return;

		return;





	smd->dev = dev;

	smd->dev = dev;

	smd->subdev.start = smd_subdev_probe;

	smd->subdev.start = smd_subdev_start;

	smd->subdev.stop = smd_subdev_remove;

	smd->subdev.stop = smd_subdev_stop;





	rproc_add_subdev(rproc, &smd->subdev);

	rproc_add_subdev(rproc, &smd->subdev);

}

}

drivers/remoteproc/remoteproc_core.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -301,14 +301,14 @@ void rproc_free_vring(struct rproc_vring *rvring) 
	rsc->vring[idx].notifyid = -1;

	rsc->vring[idx].notifyid = -1;

}

}





static int rproc_vdev_do_probe(struct rproc_subdev *subdev)

static int rproc_vdev_do_start(struct rproc_subdev *subdev)

{

{

	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);





	return rproc_add_virtio_dev(rvdev, rvdev->id);

	return rproc_add_virtio_dev(rvdev, rvdev->id);

}

}





static void rproc_vdev_do_remove(struct rproc_subdev *subdev, bool crashed)

static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)

{

{

	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
@@ -399,8 +399,8 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, 




	list_add_tail(&rvdev->node, &rproc->rvdevs);

	list_add_tail(&rvdev->node, &rproc->rvdevs);





	rvdev->subdev.start = rproc_vdev_do_probe;

	rvdev->subdev.start = rproc_vdev_do_start;

	rvdev->subdev.stop = rproc_vdev_do_remove;

	rvdev->subdev.stop = rproc_vdev_do_stop;





	rproc_add_subdev(rproc, &rvdev->subdev);

	rproc_add_subdev(rproc, &rvdev->subdev);