1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 6d01eefe2bda..6437bbeebc91 100644
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -1108,12 +1108,12 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed
         void *info;
         int ret;
 
-        channel = devm_kzalloc(&edge->dev, sizeof(*channel), GFP_KERNEL);
+        channel = kzalloc(sizeof(*channel), GFP_KERNEL);
         if (!channel)
                 return ERR_PTR(-ENOMEM);
 
         channel->edge = edge;
-        channel->name = devm_kstrdup(&edge->dev, name, GFP_KERNEL);
+        channel->name = kstrdup(name, GFP_KERNEL);
         if (!channel->name)
                 return ERR_PTR(-ENOMEM);
 
@@ -1164,8 +1164,8 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed
         return channel;
 
 free_name_and_channel:
-        devm_kfree(&edge->dev, channel->name);
-        devm_kfree(&edge->dev, channel);
+        kfree(channel->name);
+        kfree(channel);
 
         return ERR_PTR(ret);
 }
@@ -1396,13 +1396,13 @@ static int qcom_smd_parse_edge(struct device *dev,
  */
 static void qcom_smd_edge_release(struct device *dev)
 {
-        struct qcom_smd_channel *channel;
+        struct qcom_smd_channel *channel, *tmp;
         struct qcom_smd_edge *edge = to_smd_edge(dev);
 
-        list_for_each_entry(channel, &edge->channels, list) {
-                SET_RX_CHANNEL_INFO(channel, state, SMD_CHANNEL_CLOSED);
-                SET_RX_CHANNEL_INFO(channel, head, 0);
-                SET_RX_CHANNEL_INFO(channel, tail, 0);
+        list_for_each_entry_safe(channel, tmp, &edge->channels, list) {
+                list_del(&channel->list);
+                kfree(channel->name);
+                kfree(channel);
         }
 
         kfree(edge);