dmaengine: qcom_hidma: cleanup sysfs entries during remove

The 4.8-rc8 kernel is printing duplicate file entry warnings while removing
the HIDMA object. This is caused by stale sysfs entries remaining from the
previous execution.

_sysfs_warn_dup+0x5c/0x78
 sysfs_add_file_mode_ns+0x13c/0x1c0
 sysfs_create_file_ns+0x2c/0x40
 device_create_file+0x54/0xa0
 hidma_probe+0x7c8/0x808

Create hidma_sysfs_init and hidma_sysfs_uninit functions and call them from
the probe and remove path. To do proper clean up, adding the attrs object
to the device data structure to keep it around until remove call is made.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index 10425e134e06f81a0da94fbe145f6ff93d121e83..248e74bfd95a72e645a693a5d44405598683a5bb 100644 (file)
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -580,8 +580,13 @@ static ssize_t hidma_show_values(struct device *dev,
        return strlen(buf);
 }
 
-static int hidma_create_sysfs_entry(struct hidma_dev *dev, char *name,
-                                   int mode)
+static inline void  hidma_sysfs_uninit(struct hidma_dev *dev)
+{
+       device_remove_file(dev->ddev.dev, dev->chid_attrs);
+}
+
+static struct device_attribute*
+hidma_create_sysfs_entry(struct hidma_dev *dev, char *name, int mode)
 {
        struct device_attribute *attrs;
        char *name_copy;
@@ -589,18 +594,27 @@ static int hidma_create_sysfs_entry(struct hidma_dev *dev, char *name,
        attrs = devm_kmalloc(dev->ddev.dev, sizeof(struct device_attribute),
                             GFP_KERNEL);
        if (!attrs)
-               return -ENOMEM;
+               return NULL;
 
        name_copy = devm_kstrdup(dev->ddev.dev, name, GFP_KERNEL);
        if (!name_copy)
-               return -ENOMEM;
+               return NULL;
 
        attrs->attr.name = name_copy;
        attrs->attr.mode = mode;
        attrs->show = hidma_show_values;
        sysfs_attr_init(&attrs->attr);
 
-       return device_create_file(dev->ddev.dev, attrs);
+       return attrs;
+}
+
+static int hidma_sysfs_init(struct hidma_dev *dev)
+{
+       dev->chid_attrs = hidma_create_sysfs_entry(dev, "chid", S_IRUGO);
+       if (!dev->chid_attrs)
+               return -ENOMEM;
+
+       return device_create_file(dev->ddev.dev, dev->chid_attrs);
 }
 
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
@@ -830,7 +844,7 @@ static int hidma_probe(struct platform_device *pdev)
        dmadev->irq = chirq;
        tasklet_init(&dmadev->task, hidma_issue_task, (unsigned long)dmadev);
        hidma_debug_init(dmadev);
-       hidma_create_sysfs_entry(dmadev, "chid", S_IRUGO);
+       hidma_sysfs_init(dmadev);
        dev_info(&pdev->dev, "HI-DMA engine driver registration complete\n");
        pm_runtime_mark_last_busy(dmadev->ddev.dev);
        pm_runtime_put_autosuspend(dmadev->ddev.dev);
@@ -863,6 +877,7 @@ static int hidma_remove(struct platform_device *pdev)
                hidma_free_msis(dmadev);
 
        tasklet_kill(&dmadev->task);
+       hidma_sysfs_uninit(dmadev);
        hidma_debug_uninit(dmadev);
        hidma_ll_uninit(dmadev->lldev);
        hidma_free(dmadev);

diff --git a/drivers/dma/qcom/hidma.h b/drivers/dma/qcom/hidma.h
index 05f8ba49e6c6f6bbe88a08b57c6f8d58f7de1c45..c7d014235c324e1652e1d7e4c0c5a5658c28ad10 100644 (file)
--- a/drivers/dma/qcom/hidma.h
+++ b/drivers/dma/qcom/hidma.h
@@ -130,6 +130,9 @@ struct hidma_dev {
        struct dentry                   *debugfs;
        struct dentry                   *stats;
 
+       /* sysfs entry for the channel id */
+       struct device_attribute         *chid_attrs;
+
        /* Task delivering issue_pending */
        struct tasklet_struct           task;
 };