dmaengine: pxa: remove DBGFS_FUNC_DECL() (e00f50a7) · Commits · 戴 / test

drivers/dma/pxa_dma.c

+12 −24

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ bool pxad_filter_fn(struct dma_chan chan, void param);
	#include <linux/uaccess.h>		#include <linux/uaccess.h>
	#include <linux/seq_file.h>		#include <linux/seq_file.h>

	static int dbg_show_requester_chan(struct seq_file s, void p)		static int requester_chan_show(struct seq_file s, void p)
	{		{
	struct pxad_phy *phy = s->private;		struct pxad_phy *phy = s->private;
	int i;		int i;
	@@ -220,7 +220,7 @@ static int is_phys_valid(unsigned long addr)
	#define PXA_DCSR_STR(flag) (dcsr & PXA_DCSR_##flag ? #flag" " : "")		#define PXA_DCSR_STR(flag) (dcsr & PXA_DCSR_##flag ? #flag" " : "")
	#define PXA_DCMD_STR(flag) (dcmd & PXA_DCMD_##flag ? #flag" " : "")		#define PXA_DCMD_STR(flag) (dcmd & PXA_DCMD_##flag ? #flag" " : "")

	static int dbg_show_descriptors(struct seq_file s, void p)		static int descriptors_show(struct seq_file s, void p)
	{		{
	struct pxad_phy *phy = s->private;		struct pxad_phy *phy = s->private;
	int i, max_show = 20, burst, width;		int i, max_show = 20, burst, width;
	@@ -263,7 +263,7 @@ static int dbg_show_descriptors(struct seq_file s, void p)
	return 0;		return 0;
	}		}

	static int dbg_show_chan_state(struct seq_file s, void p)		static int chan_state_show(struct seq_file s, void p)
	{		{
	struct pxad_phy *phy = s->private;		struct pxad_phy *phy = s->private;
	u32 dcsr, dcmd;		u32 dcsr, dcmd;
	@@ -306,7 +306,7 @@ static int dbg_show_chan_state(struct seq_file s, void p)
	return 0;		return 0;
	}		}

	static int dbg_show_state(struct seq_file s, void p)		static int state_show(struct seq_file s, void p)
	{		{
	struct pxad_device *pdev = s->private;		struct pxad_device *pdev = s->private;

	@@ -317,22 +317,10 @@ static int dbg_show_state(struct seq_file s, void p)
	return 0;		return 0;
	}		}

	#define DBGFS_FUNC_DECL(name) \		DEFINE_SHOW_ATTRIBUTE(state);
	static int dbg_open_##name(struct inode inode, struct file file) \		DEFINE_SHOW_ATTRIBUTE(chan_state);
	{ \		DEFINE_SHOW_ATTRIBUTE(descriptors);
	return single_open(file, dbg_show_##name, inode->i_private); \		DEFINE_SHOW_ATTRIBUTE(requester_chan);
	} \
	static const struct file_operations dbg_fops_##name = { \
	.open = dbg_open_##name, \
	.llseek = seq_lseek, \
	.read = seq_read, \
	.release = single_release, \
	}

	DBGFS_FUNC_DECL(state);
	DBGFS_FUNC_DECL(chan_state);
	DBGFS_FUNC_DECL(descriptors);
	DBGFS_FUNC_DECL(requester_chan);

	static struct dentry pxad_dbg_alloc_chan(struct pxad_device pdev,		static struct dentry pxad_dbg_alloc_chan(struct pxad_device pdev,
	int ch, struct dentry *chandir)		int ch, struct dentry *chandir)
	@@ -348,13 +336,13 @@ static struct dentry pxad_dbg_alloc_chan(struct pxad_device pdev,

	if (chan)		if (chan)
	chan_state = debugfs_create_file("state", 0400, chan, dt,		chan_state = debugfs_create_file("state", 0400, chan, dt,
	&dbg_fops_chan_state);		&chan_state_fops);
	if (chan_state)		if (chan_state)
	chan_descr = debugfs_create_file("descriptors", 0400, chan, dt,		chan_descr = debugfs_create_file("descriptors", 0400, chan, dt,
	&dbg_fops_descriptors);		&descriptors_fops);
	if (chan_descr)		if (chan_descr)
	chan_reqs = debugfs_create_file("requesters", 0400, chan, dt,		chan_reqs = debugfs_create_file("requesters", 0400, chan, dt,
	&dbg_fops_requester_chan);		&requester_chan_fops);
	if (!chan_reqs)		if (!chan_reqs)
	goto err_state;		goto err_state;

	@@ -375,7 +363,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev)
	goto err_root;		goto err_root;

	pdev->dbgfs_state = debugfs_create_file("state", 0400, pdev->dbgfs_root,		pdev->dbgfs_state = debugfs_create_file("state", 0400, pdev->dbgfs_root,
	pdev, &dbg_fops_state);		pdev, &state_fops);
	if (!pdev->dbgfs_state)		if (!pdev->dbgfs_state)
	goto err_state;		goto err_state;

Admin message