Commit 8148a878 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Vinod Koul

dmaengine: pxa_dma: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Also, because there is no need to save the file dentry, remove the
variable that was saving it as it was never even being used once set.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: dmaengine@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent c33394bd
...@@ -132,7 +132,6 @@ struct pxad_device { ...@@ -132,7 +132,6 @@ struct pxad_device {
spinlock_t phy_lock; /* Phy association */ spinlock_t phy_lock; /* Phy association */
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct dentry *dbgfs_root; struct dentry *dbgfs_root;
struct dentry *dbgfs_state;
struct dentry **dbgfs_chan; struct dentry **dbgfs_chan;
#endif #endif
}; };
...@@ -326,31 +325,18 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev, ...@@ -326,31 +325,18 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev,
int ch, struct dentry *chandir) int ch, struct dentry *chandir)
{ {
char chan_name[11]; char chan_name[11];
struct dentry *chan, *chan_state = NULL, *chan_descr = NULL; struct dentry *chan;
struct dentry *chan_reqs = NULL;
void *dt; void *dt;
scnprintf(chan_name, sizeof(chan_name), "%d", ch); scnprintf(chan_name, sizeof(chan_name), "%d", ch);
chan = debugfs_create_dir(chan_name, chandir); chan = debugfs_create_dir(chan_name, chandir);
dt = (void *)&pdev->phys[ch]; dt = (void *)&pdev->phys[ch];
if (chan) debugfs_create_file("state", 0400, chan, dt, &chan_state_fops);
chan_state = debugfs_create_file("state", 0400, chan, dt, debugfs_create_file("descriptors", 0400, chan, dt, &descriptors_fops);
&chan_state_fops); debugfs_create_file("requesters", 0400, chan, dt, &requester_chan_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;
return chan; return chan;
err_state:
debugfs_remove_recursive(chan);
return NULL;
} }
static void pxad_init_debugfs(struct pxad_device *pdev) static void pxad_init_debugfs(struct pxad_device *pdev)
...@@ -358,40 +344,20 @@ static void pxad_init_debugfs(struct pxad_device *pdev) ...@@ -358,40 +344,20 @@ static void pxad_init_debugfs(struct pxad_device *pdev)
int i; int i;
struct dentry *chandir; 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 = pdev->dbgfs_chan =
kmalloc_array(pdev->nr_chans, sizeof(*pdev->dbgfs_state), kmalloc_array(pdev->nr_chans, sizeof(struct dentry *),
GFP_KERNEL); GFP_KERNEL);
if (!pdev->dbgfs_chan) 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); 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); 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) static void pxad_cleanup_debugfs(struct pxad_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment