dmaengine: remove DBGFS_FUNC_DECL()
PATCH 1/1 dmaengine: remove DBGFS_FUNC_DECL()
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Signed-off-by Yangtao Li <[email protected]>
--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++--------------------------- 4 files changed, 23 insertions(+), 70 deletions(-)
drivers/dma/amba-pl08x.c +2 -12
@@ -2505,24 +2505,14 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data) return 0; } -static int pl08x_debugfs_open (struct inode *inode,struct file *file) -{ -return single_open (file, pl08x_debugfs_show, inode->i_private); -} - -static const struct file_operations pl08x_debugfs_operations = { - .open = pl08x_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (pl08x_debugfs);static void init_pl08x_debugfs (struct pl08x_driver_data *pl08x) {/* Expose a simple debugfs interface to view all clocks */ (void )debugfs_create_file (dev_name (&pl08x->adev->dev),S_IFREG |S_IRUGO ,NULL , pl08x, - &pl08x_debugfs_operations); + &pl08x_debugfs_fops); }#else
drivers/dma/mic_x100_dma.c +3 -19
@@ -676,7 +676,7 @@ static void mic_dma_dev_unreg(struct mic_dma_device *mic_dma_dev) }/* DEBUGFS CODE */ -static int mic_dma_reg_seq_show (struct seq_file *s,void *pos) +static int mic_dma_reg_show (struct seq_file *s,void *pos) {struct mic_dma_device *mic_dma_dev = s->private;int i, chan_num, first_chan = mic_dma_dev->start_ch;
@@ -707,23 +707,7 @@ static int mic_dma_reg_seq_show(struct seq_file *s, void *pos)return 0 ; } -static int mic_dma_reg_debug_open (struct inode *inode,struct file *file) -{ -return single_open (file, mic_dma_reg_seq_show, inode->i_private); -} - -static int mic_dma_reg_debug_release (struct inode *inode,struct file *file) -{ -return single_release (inode, file); -} - -static const struct file_operations mic_dma_reg_ops = { - .owner =THIS_MODULE , - .open = mic_dma_reg_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = mic_dma_reg_debug_release -}; +DEFINE_SHOW_ATTRIBUTE (mic_dma_reg);/* Debugfs parent dir */ static struct dentry *mic_dma_dbg;
@@ -747,7 +731,7 @@ static int mic_dma_driver_probe(struct mbus_device *mbdev)if (mic_dma_dev->dbg_dir)debugfs_create_file ("mic_dma_reg" ,0444 , mic_dma_dev->dbg_dir, mic_dma_dev, - &mic_dma_reg_ops); + &mic_dma_reg_fops); }return 0 ; }
drivers/dma/pxa_dma.c +12 -12
@@ -189,7 +189,7 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param);#include <linux/uaccess.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;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_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;int i, max_show =20 , burst, width;
@@ -263,7 +263,7 @@ static int dbg_show_descriptors(struct seq_file *s, void *p)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;u32 dcsr, dcmd;
@@ -306,7 +306,7 @@ static int dbg_show_chan_state(struct seq_file *s, void *p)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;
@@ -329,10 +329,10 @@ static const struct file_operations dbg_fops_##name = { \ .release = single_release, \ } -DBGFS_FUNC_DECL (state); -DBGFS_FUNC_DECL (chan_state); -DBGFS_FUNC_DECL (descriptors); -DBGFS_FUNC_DECL (requester_chan); +DEFINE_SHOW_ATTRIBUTE (state); +DEFINE_SHOW_ATTRIBUTE (chan_state); +DEFINE_SHOW_ATTRIBUTE (descriptors); +DEFINE_SHOW_ATTRIBUTE (requester_chan);static struct dentry *pxad_dbg_alloc_chan (struct pxad_device *pdev,int ch,struct dentry *chandir)
@@ -348,13 +348,13 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev,if (chan) chan_state =debugfs_create_file ("state" ,0400 , chan, dt, - &dbg_fops_chan_state); + &chan_state_fops);if (chan_state) chan_descr =debugfs_create_file ("descriptors" ,0400 , chan, dt, - &dbg_fops_descriptors); + &descriptors_fops);if (chan_descr) chan_reqs =debugfs_create_file ("requesters" ,0400 , chan, dt, - &dbg_fops_requester_chan); + &requester_chan_fops);if (!chan_reqs) goto err_state;
@@ -375,7 +375,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev) goto err_root; pdev->dbgfs_state =debugfs_create_file ("state" ,0400 , pdev->dbgfs_root, - pdev, &dbg_fops_state); + pdev, &state_fops);if (!pdev->dbgfs_state) goto err_state;
drivers/dma/qcom/hidma_dbg.c +6 -27
@@ -85,11 +85,11 @@ static void hidma_ll_devstats(struct seq_file *s, void *llhndl) }/* -* hidma_chan_stats: display HIDMA channel statistics +* hidma_chan_show: display HIDMA channel statistics * * Display the statistics for the current HIDMA virtual channel device. */ -static int hidma_chan_stats (struct seq_file *s,void *unused) +static int hidma_chan_show (struct seq_file *s,void *unused) {struct hidma_chan *mchan = s->private;struct hidma_desc *mdesc;
@@ -117,11 +117,11 @@ static int hidma_chan_stats(struct seq_file *s, void *unused) }/* -* hidma_dma_info: display HIDMA device info +* hidma_dma_show: display HIDMA device info * * Display the info for the current HIDMA device. */ -static int hidma_dma_info (struct seq_file *s,void *unused) +static int hidma_dma_show (struct seq_file *s,void *unused) {struct hidma_dev *dmadev = s->private;resource_size_t sz;
@@ -138,29 +138,8 @@ static int hidma_dma_info(struct seq_file *s, void *unused)return 0 ; } -static int hidma_chan_stats_open (struct inode *inode,struct file *file) -{ -return single_open (file, hidma_chan_stats, inode->i_private); -} - -static int hidma_dma_info_open (struct inode *inode,struct file *file) -{ -return single_open (file, hidma_dma_info, inode->i_private); -} - -static const struct file_operations hidma_chan_fops = { - .open = hidma_chan_stats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations hidma_dma_fops = { - .open = hidma_dma_info_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (hidma_chan); +DEFINE_SHOW_ATTRIBUTE (hidma_dma);void hidma_debug_uninit (struct hidma_dev *dmadev) {
Quoted 10 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Signed-off-by Yangtao Li<[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------
Quoted 1 line
4 files changed, 23 insertions(+), 70 deletions(-)
Quoted 11 lines · Sinan Kaya
Quoted 10 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Signed-off-by Yangtao Li<[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------
For pxa_dma:
Acked-by Robert Jarzmik <[email protected]>
Cheers.
Vinod Koul
maintainerQuoted 3 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Spaces after full stop and comma please
Quoted 7 lines
Signed-off-by Yangtao Li <[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------
Do you mind splitting it per file.
Quoted 227 lines
4 files changed, 23 insertions(+), 70 deletions(-)drivers/dma/amba-pl08x.c +2
-12@@ -2505,24 +2505,14 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data) return 0; } -static int pl08x_debugfs_open (struct inode *inode,struct file *file) -{ -return single_open (file, pl08x_debugfs_show, inode->i_private); -} - -static const struct file_operations pl08x_debugfs_operations = { - .open = pl08x_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (pl08x_debugfs);static void init_pl08x_debugfs (struct pl08x_driver_data *pl08x) {/* Expose a simple debugfs interface to view all clocks */ (void )debugfs_create_file (dev_name (&pl08x->adev->dev),S_IFREG |S_IRUGO ,NULL , pl08x, - &pl08x_debugfs_operations); + &pl08x_debugfs_fops); }#else drivers/dma/mic_x100_dma.c +3
-19@@ -676,7 +676,7 @@ static void mic_dma_dev_unreg(struct mic_dma_device *mic_dma_dev) }/* DEBUGFS CODE */ -static int mic_dma_reg_seq_show (struct seq_file *s,void *pos) +static int mic_dma_reg_show (struct seq_file *s,void *pos) {struct mic_dma_device *mic_dma_dev = s->private;int i, chan_num, first_chan = mic_dma_dev->start_ch;@@ -707,23 +707,7 @@ static int mic_dma_reg_seq_show(struct seq_file *s, void *pos)return 0 ; } -static int mic_dma_reg_debug_open (struct inode *inode,struct file *file) -{ -return single_open (file, mic_dma_reg_seq_show, inode->i_private); -} - -static int mic_dma_reg_debug_release (struct inode *inode,struct file *file) -{ -return single_release (inode, file); -} - -static const struct file_operations mic_dma_reg_ops = { - .owner =THIS_MODULE , - .open = mic_dma_reg_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = mic_dma_reg_debug_release -}; +DEFINE_SHOW_ATTRIBUTE (mic_dma_reg);/* Debugfs parent dir */ static struct dentry *mic_dma_dbg;@@ -747,7 +731,7 @@ static int mic_dma_driver_probe(struct mbus_device *mbdev)if (mic_dma_dev->dbg_dir)debugfs_create_file ("mic_dma_reg" ,0444 , mic_dma_dev->dbg_dir, mic_dma_dev, - &mic_dma_reg_ops); + &mic_dma_reg_fops); }return 0 ; }drivers/dma/pxa_dma.c +12
-12@@ -189,7 +189,7 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param);#include <linux/uaccess.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;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_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;int i, max_show =20 , burst, width;@@ -263,7 +263,7 @@ static int dbg_show_descriptors(struct seq_file *s, void *p)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;u32 dcsr, dcmd;@@ -306,7 +306,7 @@ static int dbg_show_chan_state(struct seq_file *s, void *p)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;@@ -329,10 +329,10 @@ static const struct file_operations dbg_fops_##name = { \ .release = single_release, \ } -DBGFS_FUNC_DECL (state); -DBGFS_FUNC_DECL (chan_state); -DBGFS_FUNC_DECL (descriptors); -DBGFS_FUNC_DECL (requester_chan); +DEFINE_SHOW_ATTRIBUTE (state); +DEFINE_SHOW_ATTRIBUTE (chan_state); +DEFINE_SHOW_ATTRIBUTE (descriptors); +DEFINE_SHOW_ATTRIBUTE (requester_chan);static struct dentry *pxad_dbg_alloc_chan (struct pxad_device *pdev,int ch,struct dentry *chandir)@@ -348,13 +348,13 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev,if (chan) chan_state =debugfs_create_file ("state" ,0400 , chan, dt, - &dbg_fops_chan_state); + &chan_state_fops);if (chan_state) chan_descr =debugfs_create_file ("descriptors" ,0400 , chan, dt, - &dbg_fops_descriptors); + &descriptors_fops);if (chan_descr) chan_reqs =debugfs_create_file ("requesters" ,0400 , chan, dt, - &dbg_fops_requester_chan); + &requester_chan_fops);if (!chan_reqs) goto err_state;@@ -375,7 +375,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev) goto err_root; pdev->dbgfs_state =debugfs_create_file ("state" ,0400 , pdev->dbgfs_root, - pdev, &dbg_fops_state); + pdev, &state_fops);if (!pdev->dbgfs_state) goto err_state;drivers/dma/qcom/hidma_dbg.c +6
-27@@ -85,11 +85,11 @@ static void hidma_ll_devstats(struct seq_file *s, void *llhndl) }/* -* hidma_chan_stats: display HIDMA channel statistics +* hidma_chan_show: display HIDMA channel statistics * * Display the statistics for the current HIDMA virtual channel device. */ -static int hidma_chan_stats (struct seq_file *s,void *unused) +static int hidma_chan_show (struct seq_file *s,void *unused) {struct hidma_chan *mchan = s->private;struct hidma_desc *mdesc;@@ -117,11 +117,11 @@ static int hidma_chan_stats(struct seq_file *s, void *unused) }/* -* hidma_dma_info: display HIDMA device info +* hidma_dma_show: display HIDMA device info * * Display the info for the current HIDMA device. */ -static int hidma_dma_info (struct seq_file *s,void *unused) +static int hidma_dma_show (struct seq_file *s,void *unused) {struct hidma_dev *dmadev = s->private;resource_size_t sz;@@ -138,29 +138,8 @@ static int hidma_dma_info(struct seq_file *s, void *unused)return 0 ; } -static int hidma_chan_stats_open (struct inode *inode,struct file *file) -{ -return single_open (file, hidma_chan_stats, inode->i_private); -} - -static int hidma_dma_info_open (struct inode *inode,struct file *file) -{ -return single_open (file, hidma_dma_info, inode->i_private); -} - -static const struct file_operations hidma_chan_fops = { - .open = hidma_chan_stats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations hidma_dma_fops = { - .open = hidma_dma_info_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (hidma_chan); +DEFINE_SHOW_ATTRIBUTE (hidma_dma);void hidma_debug_uninit (struct hidma_dev *dmadev) {Signature · 1 line
2.17.0
Quoted 9 lines · Vinod Koul
Quoted 3 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Spaces after full stop and comma please
Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Signed-off-by Yangtao Li <[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------Do you mind splitting it per file.
Hi Vinod:
Why not apply it once ？The change is not too big.
Thanks，
Yangtao
Vinod Koul
maintainerQuoted 17 lines · Frank Lee
Quoted 16 lines · Vinod Koul
Quoted 3 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Spaces after full stop and comma please
Quoted 7 lines
Signed-off-by Yangtao Li <[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------
Quoted 4 lines
Quoted 1 line
Do you mind splitting it per file.
Hi Vinod:
Why not apply it once ？The change is not too big.
It is not about big or small. A patch should do one thing and touch a single module.
It also helps people when they look at changes and backports.
Quoted 20 lines · Vinod Koul
Quoted 18 lines · Frank Lee
Quoted 17 lines · Vinod Koul
Quoted 3 lines · Yangtao Li
We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code.
Spaces after full stop and comma please
Quoted 7 lines
Signed-off-by Yangtao Li <[email protected]>--- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++---------------------------Do you mind splitting it per file.
Quoted 8 lines
Quoted 3 lines
Hi Vinod:
Why not apply it once ？The change is not too big.
It is not about big or small. A patch should do one thing and touch a single module.
It also helps people when they look at changes and backports.
Already divided into small files, as you need.
MBR,
Yangtao
Quoted 3 lines
--
~Vinod