Merge tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[sfrench/cifs-2.6.git] / drivers / dma / pxa_dma.c

diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c
index 468c234cb3bea405568d6909bdda571a86a0bd42..349fb312c8725678a2a1268a4371047dbcb2ed11 100644 (file)
--- a/drivers/dma/pxa_dma.c
+++ b/drivers/dma/pxa_dma.c
@@ -129,7 +129,6 @@ struct pxad_device {
        spinlock_t                      phy_lock;       /* Phy association */
 #ifdef CONFIG_DEBUG_FS
        struct dentry                   *dbgfs_root;
-       struct dentry                   *dbgfs_state;
        struct dentry                   **dbgfs_chan;
 #endif
 };
@@ -323,31 +322,18 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev,
                                             int ch, struct dentry *chandir)
 {
        char chan_name[11];
-       struct dentry *chan, *chan_state = NULL, *chan_descr = NULL;
-       struct dentry *chan_reqs = NULL;
+       struct dentry *chan;
        void *dt;
 
        scnprintf(chan_name, sizeof(chan_name), "%d", ch);
        chan = debugfs_create_dir(chan_name, chandir);
        dt = (void *)&pdev->phys[ch];
 
-       if (chan)
-               chan_state = debugfs_create_file("state", 0400, chan, dt,
-                                                &chan_state_fops);
-       if (chan_state)
-               chan_descr = debugfs_create_file("descriptors", 0400, chan, dt,
-                                                &descriptors_fops);
-       if (chan_descr)
-               chan_reqs = debugfs_create_file("requesters", 0400, chan, dt,
-                                               &requester_chan_fops);
-       if (!chan_reqs)
-               goto err_state;
+       debugfs_create_file("state", 0400, chan, dt, &chan_state_fops);
+       debugfs_create_file("descriptors", 0400, chan, dt, &descriptors_fops);
+       debugfs_create_file("requesters", 0400, chan, dt, &requester_chan_fops);
 
        return chan;
-
-err_state:
-       debugfs_remove_recursive(chan);
-       return NULL;
 }
 
 static void pxad_init_debugfs(struct pxad_device *pdev)
@@ -355,40 +341,20 @@ static void pxad_init_debugfs(struct pxad_device *pdev)
        int i;
        struct dentry *chandir;
 
-       pdev->dbgfs_root = debugfs_create_dir(dev_name(pdev->slave.dev), NULL);
-       if (IS_ERR(pdev->dbgfs_root) || !pdev->dbgfs_root)
-               goto err_root;
-
-       pdev->dbgfs_state = debugfs_create_file("state", 0400, pdev->dbgfs_root,
-                                               pdev, &state_fops);
-       if (!pdev->dbgfs_state)
-               goto err_state;
-
        pdev->dbgfs_chan =
-               kmalloc_array(pdev->nr_chans, sizeof(*pdev->dbgfs_state),
+               kmalloc_array(pdev->nr_chans, sizeof(struct dentry *),
                              GFP_KERNEL);
        if (!pdev->dbgfs_chan)
-               goto err_alloc;
+               return;
+
+       pdev->dbgfs_root = debugfs_create_dir(dev_name(pdev->slave.dev), NULL);
+
+       debugfs_create_file("state", 0400, pdev->dbgfs_root, pdev, &state_fops);
 
        chandir = debugfs_create_dir("channels", pdev->dbgfs_root);
-       if (!chandir)
-               goto err_chandir;
 
-       for (i = 0; i < pdev->nr_chans; i++) {
+       for (i = 0; i < pdev->nr_chans; i++)
                pdev->dbgfs_chan[i] = pxad_dbg_alloc_chan(pdev, i, chandir);
-               if (!pdev->dbgfs_chan[i])
-                       goto err_chans;
-       }
-
-       return;
-err_chans:
-err_chandir:
-       kfree(pdev->dbgfs_chan);
-err_alloc:
-err_state:
-       debugfs_remove_recursive(pdev->dbgfs_root);
-err_root:
-       pr_err("pxad: debugfs is not available\n");
 }
 
 static void pxad_cleanup_debugfs(struct pxad_device *pdev)