|
@@ -290,22 +290,36 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *rpdev,
|
|
|
EXPORT_SYMBOL(rpmsg_create_ept);
|
|
|
|
|
|
/**
|
|
|
- * rpmsg_destroy_ept() - destroy an existing rpmsg endpoint
|
|
|
+ * __rpmsg_destroy_ept() - destroy an existing rpmsg endpoint
|
|
|
+ * @vrp: virtproc which owns this ept
|
|
|
* @ept: endpoing to destroy
|
|
|
*
|
|
|
- * Should be used by drivers to destroy an rpmsg endpoint previously
|
|
|
- * created with rpmsg_create_ept().
|
|
|
+ * An internal function which destroy an ept without assuming it is
|
|
|
+ * bound to an rpmsg channel. This is needed for handling the internal
|
|
|
+ * name service endpoint, which isn't bound to an rpmsg channel.
|
|
|
+ * See also __rpmsg_create_ept().
|
|
|
*/
|
|
|
-void rpmsg_destroy_ept(struct rpmsg_endpoint *ept)
|
|
|
+static void
|
|
|
+__rpmsg_destroy_ept(struct virtproc_info *vrp, struct rpmsg_endpoint *ept)
|
|
|
{
|
|
|
- struct virtproc_info *vrp = ept->rpdev->vrp;
|
|
|
-
|
|
|
mutex_lock(&vrp->endpoints_lock);
|
|
|
idr_remove(&vrp->endpoints, ept->addr);
|
|
|
mutex_unlock(&vrp->endpoints_lock);
|
|
|
|
|
|
kfree(ept);
|
|
|
}
|
|
|
+
|
|
|
+/**
|
|
|
+ * rpmsg_destroy_ept() - destroy an existing rpmsg endpoint
|
|
|
+ * @ept: endpoing to destroy
|
|
|
+ *
|
|
|
+ * Should be used by drivers to destroy an rpmsg endpoint previously
|
|
|
+ * created with rpmsg_create_ept().
|
|
|
+ */
|
|
|
+void rpmsg_destroy_ept(struct rpmsg_endpoint *ept)
|
|
|
+{
|
|
|
+ __rpmsg_destroy_ept(ept->rpdev->vrp, ept);
|
|
|
+}
|
|
|
EXPORT_SYMBOL(rpmsg_destroy_ept);
|
|
|
|
|
|
/*
|
|
@@ -964,6 +978,9 @@ static void __devexit rpmsg_remove(struct virtio_device *vdev)
|
|
|
if (ret)
|
|
|
dev_warn(&vdev->dev, "can't remove rpmsg device: %d\n", ret);
|
|
|
|
|
|
+ if (vrp->ns_ept)
|
|
|
+ __rpmsg_destroy_ept(vrp, vrp->ns_ept);
|
|
|
+
|
|
|
idr_remove_all(&vrp->endpoints);
|
|
|
idr_destroy(&vrp->endpoints);
|
|
|
|