Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rpmsg-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson:
- Reduce code duplication related to channel removal, and invoke the
removal in one case previously missing, both in the Glink driver
* tag 'rpmsg-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
rpmsg: glink: remove duplicate code for rpmsg device remove
rpmsg: glink: fix rpmsg device leak
+16
-19
+16
-19
drivers/rpmsg/qcom_glink_native.c
+16
-19
drivers/rpmsg/qcom_glink_native.c
···
1395
1395
return 0;
1396
1396
}
1397
1397
1398
+
static void qcom_glink_remove_rpmsg_device(struct qcom_glink *glink, struct glink_channel *channel)
1399
+
{
1400
+
struct rpmsg_channel_info chinfo;
1401
+
1402
+
if (channel->rpdev) {
1403
+
strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));
1404
+
chinfo.src = RPMSG_ADDR_ANY;
1405
+
chinfo.dst = RPMSG_ADDR_ANY;
1406
+
rpmsg_unregister_device(glink->dev, &chinfo);
1407
+
}
1408
+
channel->rpdev = NULL;
1409
+
}
1410
+
1398
1411
static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)
1399
1412
{
1400
1413
struct glink_channel *channel = to_glink_channel(ept);
···
1419
1406
spin_unlock_irqrestore(&channel->recv_lock, flags);
1420
1407
1421
1408
/* Decouple the potential rpdev from the channel */
1422
-
channel->rpdev = NULL;
1409
+
qcom_glink_remove_rpmsg_device(glink, channel);
1423
1410
1424
1411
qcom_glink_send_close_req(glink, channel);
1425
1412
}
···
1710
1697
1711
1698
static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)
1712
1699
{
1713
-
struct rpmsg_channel_info chinfo;
1714
1700
struct glink_channel *channel;
1715
1701
unsigned long flags;
1716
1702
···
1725
1713
/* cancel pending rx_done work */
1726
1714
cancel_work_sync(&channel->intent_work);
1727
1715
1728
-
if (channel->rpdev) {
1729
-
strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));
1730
-
chinfo.src = RPMSG_ADDR_ANY;
1731
-
chinfo.dst = RPMSG_ADDR_ANY;
1732
-
1733
-
rpmsg_unregister_device(glink->dev, &chinfo);
1734
-
}
1735
-
channel->rpdev = NULL;
1716
+
qcom_glink_remove_rpmsg_device(glink, channel);
1736
1717
1737
1718
qcom_glink_send_close_ack(glink, channel);
1738
1719
···
1739
1734
1740
1735
static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid)
1741
1736
{
1742
-
struct rpmsg_channel_info chinfo;
1743
1737
struct glink_channel *channel;
1744
1738
unsigned long flags;
1745
1739
···
1760
1756
spin_unlock_irqrestore(&glink->idr_lock, flags);
1761
1757
1762
1758
/* Decouple the potential rpdev from the channel */
1763
-
if (channel->rpdev) {
1764
-
strscpy(chinfo.name, channel->name, sizeof(chinfo.name));
1765
-
chinfo.src = RPMSG_ADDR_ANY;
1766
-
chinfo.dst = RPMSG_ADDR_ANY;
1767
-
1768
-
rpmsg_unregister_device(glink->dev, &chinfo);
1769
-
}
1770
-
channel->rpdev = NULL;
1759
+
qcom_glink_remove_rpmsg_device(glink, channel);
1771
1760
1772
1761
kref_put(&channel->refcount, qcom_glink_channel_release);
1773
1762
}