| Message ID | 1403901130-8156-1-git-send-email-fabf@skynet.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 27, 2014 at 10:32:10PM +0200, Fabian Frederick wrote: > null test before debugfs_remove_recursive is not needed so one line function > dma_buf_uninit_debugfs can be removed. > > This patch calls debugfs_remove_recursive under CONFIG_DEBUG_FS > > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-media@vger.kernel.org > Signed-off-by: Fabian Frederick <fabf@skynet.be> > --- > > This is untested. > > drivers/base/dma-buf.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c > index 840c7fa..184c0cb 100644 > --- a/drivers/base/dma-buf.c > +++ b/drivers/base/dma-buf.c > @@ -701,12 +701,6 @@ static int dma_buf_init_debugfs(void) > return err; > } > > -static void dma_buf_uninit_debugfs(void) > -{ > - if (dma_buf_debugfs_dir) > - debugfs_remove_recursive(dma_buf_debugfs_dir); > -} > - > int dma_buf_debugfs_create_file(const char *name, > int (*write)(struct seq_file *)) > { > @@ -722,9 +716,6 @@ static inline int dma_buf_init_debugfs(void) > { > return 0; > } > -static inline void dma_buf_uninit_debugfs(void) > -{ > -} > #endif > > static int __init dma_buf_init(void) > @@ -738,6 +729,8 @@ subsys_initcall(dma_buf_init); > > static void __exit dma_buf_deinit(void) > { > - dma_buf_uninit_debugfs(); > +#ifdef CONFIG_DEBUG_FS > + debugfs_remove_recursive(dma_buf_debugfs_dir); > +#endif That ifdef should not be needed at all, right? No ifdefs should be needed for debugfs code, if it is written correctly :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> On 10 July 2014 at 02:34 Greg Kroah-Hartman <gregkh@linuxfoundation.org> > wrote: > > > On Fri, Jun 27, 2014 at 10:32:10PM +0200, Fabian Frederick wrote: > > null test before debugfs_remove_recursive is not needed so one line function > > dma_buf_uninit_debugfs can be removed. > > > > This patch calls debugfs_remove_recursive under CONFIG_DEBUG_FS > > > > Cc: Sumit Semwal <sumit.semwal@linaro.org> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cc: linux-media@vger.kernel.org > > Signed-off-by: Fabian Frederick <fabf@skynet.be> > > --- > > > > This is untested. > > > > drivers/base/dma-buf.c | 13 +++---------- > > 1 file changed, 3 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c > > index 840c7fa..184c0cb 100644 > > --- a/drivers/base/dma-buf.c > > +++ b/drivers/base/dma-buf.c > > @@ -701,12 +701,6 @@ static int dma_buf_init_debugfs(void) > > return err; > > } > > > > -static void dma_buf_uninit_debugfs(void) > > -{ > > - if (dma_buf_debugfs_dir) > > - debugfs_remove_recursive(dma_buf_debugfs_dir); > > -} > > - > > int dma_buf_debugfs_create_file(const char *name, > > int (*write)(struct seq_file *)) > > { > > @@ -722,9 +716,6 @@ static inline int dma_buf_init_debugfs(void) > > { > > return 0; > > } > > -static inline void dma_buf_uninit_debugfs(void) > > -{ > > -} > > #endif > > > > static int __init dma_buf_init(void) > > @@ -738,6 +729,8 @@ subsys_initcall(dma_buf_init); > > > > static void __exit dma_buf_deinit(void) > > { > > - dma_buf_uninit_debugfs(); > > +#ifdef CONFIG_DEBUG_FS > > + debugfs_remove_recursive(dma_buf_debugfs_dir); > > +#endif > > That ifdef should not be needed at all, right? No ifdefs should be > needed for debugfs code, if it is written correctly :) > Hello Greg, Current dma_buf_init_debugfs and dma_buf_init_uninit_debugfs and related functions in drivers/base/dma-buf.c are only defined under #ifdef CONFIG_DEBUG_FS ; reason for that #ifdef in the patch. I'll send you a fixed version. Thanks, Fabian > thanks, > > greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 840c7fa..184c0cb 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -701,12 +701,6 @@ static int dma_buf_init_debugfs(void) return err; } -static void dma_buf_uninit_debugfs(void) -{ - if (dma_buf_debugfs_dir) - debugfs_remove_recursive(dma_buf_debugfs_dir); -} - int dma_buf_debugfs_create_file(const char *name, int (*write)(struct seq_file *)) { @@ -722,9 +716,6 @@ static inline int dma_buf_init_debugfs(void) { return 0; } -static inline void dma_buf_uninit_debugfs(void) -{ -} #endif static int __init dma_buf_init(void) @@ -738,6 +729,8 @@ subsys_initcall(dma_buf_init); static void __exit dma_buf_deinit(void) { - dma_buf_uninit_debugfs(); +#ifdef CONFIG_DEBUG_FS + debugfs_remove_recursive(dma_buf_debugfs_dir); +#endif } __exitcall(dma_buf_deinit);
null test before debugfs_remove_recursive is not needed so one line function dma_buf_uninit_debugfs can be removed. This patch calls debugfs_remove_recursive under CONFIG_DEBUG_FS Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick <fabf@skynet.be> --- This is untested. drivers/base/dma-buf.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)