* Re: [PATCH v2] cxl: no need to check return value of debugfs_create functions
2019-06-12 15:54 [PATCH v2] cxl: no need to check return value of debugfs_create functions Greg Kroah-Hartman
@ 2019-06-12 18:22 ` Arnd Bergmann
2019-06-13 18:01 ` Frederic Barrat
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2019-06-12 18:22 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Frederic Barrat, linuxppc-dev, Andrew Donnellan
On Wed, Jun 12, 2019 at 5:54 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> 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.
>
> Because there's no need to check, also make the return value of the
> local debugfs_create_io_x64() call void, as no one ever did anything
> with the return value (as they did not need to.)
>
> And make the cxl_debugfs_* calls return void as no one was even checking
> their return value at all.
>
> Cc: Frederic Barrat <fbarrat@linux.ibm.com>
> Cc: Andrew Donnellan <ajd@linux.ibm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cxl: no need to check return value of debugfs_create functions
2019-06-12 15:54 [PATCH v2] cxl: no need to check return value of debugfs_create functions Greg Kroah-Hartman
2019-06-12 18:22 ` Arnd Bergmann
@ 2019-06-13 18:01 ` Frederic Barrat
2019-06-14 8:22 ` Andrew Donnellan
2019-06-30 8:37 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Frederic Barrat @ 2019-06-13 18:01 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linuxppc-dev, Andrew Donnellan, Arnd Bergmann
Le 12/06/2019 à 17:54, Greg Kroah-Hartman a écrit :
> 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.
>
> Because there's no need to check, also make the return value of the
> local debugfs_create_io_x64() call void, as no one ever did anything
> with the return value (as they did not need to.)
>
> And make the cxl_debugfs_* calls return void as no one was even checking
> their return value at all.
>
> Cc: Frederic Barrat <fbarrat@linux.ibm.com>
> Cc: Andrew Donnellan <ajd@linux.ibm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
Thanks!
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
> v2: make the return value of all of the cxl_debugfs_* calls void as no
> one was checking the return values of them.
>
> drivers/misc/cxl/cxl.h | 15 ++++++---------
> drivers/misc/cxl/debugfs.c | 36 +++++++++++-------------------------
> 2 files changed, 17 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
> index a73c9e669d78..5dc0f6093f9d 100644
> --- a/drivers/misc/cxl/cxl.h
> +++ b/drivers/misc/cxl/cxl.h
> @@ -908,11 +908,11 @@ void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx);
>
> #ifdef CONFIG_DEBUG_FS
>
> -int cxl_debugfs_init(void);
> +void cxl_debugfs_init(void);
> void cxl_debugfs_exit(void);
> -int cxl_debugfs_adapter_add(struct cxl *adapter);
> +void cxl_debugfs_adapter_add(struct cxl *adapter);
> void cxl_debugfs_adapter_remove(struct cxl *adapter);
> -int cxl_debugfs_afu_add(struct cxl_afu *afu);
> +void cxl_debugfs_afu_add(struct cxl_afu *afu);
> void cxl_debugfs_afu_remove(struct cxl_afu *afu);
> void cxl_debugfs_add_adapter_regs_psl9(struct cxl *adapter, struct dentry *dir);
> void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir);
> @@ -921,27 +921,24 @@ void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir);
>
> #else /* CONFIG_DEBUG_FS */
>
> -static inline int __init cxl_debugfs_init(void)
> +static inline void __init cxl_debugfs_init(void)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_exit(void)
> {
> }
>
> -static inline int cxl_debugfs_adapter_add(struct cxl *adapter)
> +static inline void cxl_debugfs_adapter_add(struct cxl *adapter)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_adapter_remove(struct cxl *adapter)
> {
> }
>
> -static inline int cxl_debugfs_afu_add(struct cxl_afu *afu)
> +static inline void cxl_debugfs_afu_add(struct cxl_afu *afu)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> diff --git a/drivers/misc/cxl/debugfs.c b/drivers/misc/cxl/debugfs.c
> index 1fda22c24c93..7b987bf498b5 100644
> --- a/drivers/misc/cxl/debugfs.c
> +++ b/drivers/misc/cxl/debugfs.c
> @@ -26,11 +26,11 @@ static int debugfs_io_u64_set(void *data, u64 val)
> DEFINE_DEBUGFS_ATTRIBUTE(fops_io_x64, debugfs_io_u64_get, debugfs_io_u64_set,
> "0x%016llx\n");
>
> -static struct dentry *debugfs_create_io_x64(const char *name, umode_t mode,
> - struct dentry *parent, u64 __iomem *value)
> +static void debugfs_create_io_x64(const char *name, umode_t mode,
> + struct dentry *parent, u64 __iomem *value)
> {
> - return debugfs_create_file_unsafe(name, mode, parent,
> - (void __force *)value, &fops_io_x64);
> + debugfs_create_file_unsafe(name, mode, parent, (void __force *)value,
> + &fops_io_x64);
> }
>
> void cxl_debugfs_add_adapter_regs_psl9(struct cxl *adapter, struct dentry *dir)
> @@ -54,25 +54,22 @@ void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir)
> debugfs_create_io_x64("trace", S_IRUSR | S_IWUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_TRACE));
> }
>
> -int cxl_debugfs_adapter_add(struct cxl *adapter)
> +void cxl_debugfs_adapter_add(struct cxl *adapter)
> {
> struct dentry *dir;
> char buf[32];
>
> if (!cxl_debugfs)
> - return -ENODEV;
> + return;
>
> snprintf(buf, 32, "card%i", adapter->adapter_num);
> dir = debugfs_create_dir(buf, cxl_debugfs);
> - if (IS_ERR(dir))
> - return PTR_ERR(dir);
> adapter->debugfs = dir;
>
> debugfs_create_io_x64("err_ivte", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_ErrIVTE));
>
> if (adapter->native->sl_ops->debugfs_add_adapter_regs)
> adapter->native->sl_ops->debugfs_add_adapter_regs(adapter, dir);
> - return 0;
> }
>
> void cxl_debugfs_adapter_remove(struct cxl *adapter)
> @@ -96,18 +93,16 @@ void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)
> debugfs_create_io_x64("trace", S_IRUSR | S_IWUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SLICE_TRACE));
> }
>
> -int cxl_debugfs_afu_add(struct cxl_afu *afu)
> +void cxl_debugfs_afu_add(struct cxl_afu *afu)
> {
> struct dentry *dir;
> char buf[32];
>
> if (!afu->adapter->debugfs)
> - return -ENODEV;
> + return;
>
> snprintf(buf, 32, "psl%i.%i", afu->adapter->adapter_num, afu->slice);
> dir = debugfs_create_dir(buf, afu->adapter->debugfs);
> - if (IS_ERR(dir))
> - return PTR_ERR(dir);
> afu->debugfs = dir;
>
> debugfs_create_io_x64("sr", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SR_An));
> @@ -118,8 +113,6 @@ int cxl_debugfs_afu_add(struct cxl_afu *afu)
>
> if (afu->adapter->native->sl_ops->debugfs_add_afu_regs)
> afu->adapter->native->sl_ops->debugfs_add_afu_regs(afu, dir);
> -
> - return 0;
> }
>
> void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> @@ -127,19 +120,12 @@ void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> debugfs_remove_recursive(afu->debugfs);
> }
>
> -int __init cxl_debugfs_init(void)
> +void __init cxl_debugfs_init(void)
> {
> - struct dentry *ent;
> -
> if (!cpu_has_feature(CPU_FTR_HVMODE))
> - return 0;
> -
> - ent = debugfs_create_dir("cxl", NULL);
> - if (IS_ERR(ent))
> - return PTR_ERR(ent);
> - cxl_debugfs = ent;
> + return;
>
> - return 0;
> + cxl_debugfs = debugfs_create_dir("cxl", NULL);
> }
>
> void cxl_debugfs_exit(void)
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cxl: no need to check return value of debugfs_create functions
2019-06-12 15:54 [PATCH v2] cxl: no need to check return value of debugfs_create functions Greg Kroah-Hartman
2019-06-12 18:22 ` Arnd Bergmann
2019-06-13 18:01 ` Frederic Barrat
@ 2019-06-14 8:22 ` Andrew Donnellan
2019-06-30 8:37 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Donnellan @ 2019-06-14 8:22 UTC (permalink / raw)
To: Greg Kroah-Hartman, Frederic Barrat; +Cc: linuxppc-dev, Arnd Bergmann
On 13/6/19 1:54 am, Greg Kroah-Hartman wrote:
> 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.
>
> Because there's no need to check, also make the return value of the
> local debugfs_create_io_x64() call void, as no one ever did anything
> with the return value (as they did not need to.)
>
> And make the cxl_debugfs_* calls return void as no one was even checking
> their return value at all.
>
> Cc: Frederic Barrat <fbarrat@linux.ibm.com>
> Cc: Andrew Donnellan <ajd@linux.ibm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
> ---
> v2: make the return value of all of the cxl_debugfs_* calls void as no
> one was checking the return values of them.
>
> drivers/misc/cxl/cxl.h | 15 ++++++---------
> drivers/misc/cxl/debugfs.c | 36 +++++++++++-------------------------
> 2 files changed, 17 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
> index a73c9e669d78..5dc0f6093f9d 100644
> --- a/drivers/misc/cxl/cxl.h
> +++ b/drivers/misc/cxl/cxl.h
> @@ -908,11 +908,11 @@ void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx);
>
> #ifdef CONFIG_DEBUG_FS
>
> -int cxl_debugfs_init(void);
> +void cxl_debugfs_init(void);
> void cxl_debugfs_exit(void);
> -int cxl_debugfs_adapter_add(struct cxl *adapter);
> +void cxl_debugfs_adapter_add(struct cxl *adapter);
> void cxl_debugfs_adapter_remove(struct cxl *adapter);
> -int cxl_debugfs_afu_add(struct cxl_afu *afu);
> +void cxl_debugfs_afu_add(struct cxl_afu *afu);
> void cxl_debugfs_afu_remove(struct cxl_afu *afu);
> void cxl_debugfs_add_adapter_regs_psl9(struct cxl *adapter, struct dentry *dir);
> void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir);
> @@ -921,27 +921,24 @@ void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir);
>
> #else /* CONFIG_DEBUG_FS */
>
> -static inline int __init cxl_debugfs_init(void)
> +static inline void __init cxl_debugfs_init(void)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_exit(void)
> {
> }
>
> -static inline int cxl_debugfs_adapter_add(struct cxl *adapter)
> +static inline void cxl_debugfs_adapter_add(struct cxl *adapter)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_adapter_remove(struct cxl *adapter)
> {
> }
>
> -static inline int cxl_debugfs_afu_add(struct cxl_afu *afu)
> +static inline void cxl_debugfs_afu_add(struct cxl_afu *afu)
> {
> - return 0;
> }
>
> static inline void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> diff --git a/drivers/misc/cxl/debugfs.c b/drivers/misc/cxl/debugfs.c
> index 1fda22c24c93..7b987bf498b5 100644
> --- a/drivers/misc/cxl/debugfs.c
> +++ b/drivers/misc/cxl/debugfs.c
> @@ -26,11 +26,11 @@ static int debugfs_io_u64_set(void *data, u64 val)
> DEFINE_DEBUGFS_ATTRIBUTE(fops_io_x64, debugfs_io_u64_get, debugfs_io_u64_set,
> "0x%016llx\n");
>
> -static struct dentry *debugfs_create_io_x64(const char *name, umode_t mode,
> - struct dentry *parent, u64 __iomem *value)
> +static void debugfs_create_io_x64(const char *name, umode_t mode,
> + struct dentry *parent, u64 __iomem *value)
> {
> - return debugfs_create_file_unsafe(name, mode, parent,
> - (void __force *)value, &fops_io_x64);
> + debugfs_create_file_unsafe(name, mode, parent, (void __force *)value,
> + &fops_io_x64);
> }
>
> void cxl_debugfs_add_adapter_regs_psl9(struct cxl *adapter, struct dentry *dir)
> @@ -54,25 +54,22 @@ void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir)
> debugfs_create_io_x64("trace", S_IRUSR | S_IWUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_TRACE));
> }
>
> -int cxl_debugfs_adapter_add(struct cxl *adapter)
> +void cxl_debugfs_adapter_add(struct cxl *adapter)
> {
> struct dentry *dir;
> char buf[32];
>
> if (!cxl_debugfs)
> - return -ENODEV;
> + return;
>
> snprintf(buf, 32, "card%i", adapter->adapter_num);
> dir = debugfs_create_dir(buf, cxl_debugfs);
> - if (IS_ERR(dir))
> - return PTR_ERR(dir);
> adapter->debugfs = dir;
>
> debugfs_create_io_x64("err_ivte", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_ErrIVTE));
>
> if (adapter->native->sl_ops->debugfs_add_adapter_regs)
> adapter->native->sl_ops->debugfs_add_adapter_regs(adapter, dir);
> - return 0;
> }
>
> void cxl_debugfs_adapter_remove(struct cxl *adapter)
> @@ -96,18 +93,16 @@ void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)
> debugfs_create_io_x64("trace", S_IRUSR | S_IWUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SLICE_TRACE));
> }
>
> -int cxl_debugfs_afu_add(struct cxl_afu *afu)
> +void cxl_debugfs_afu_add(struct cxl_afu *afu)
> {
> struct dentry *dir;
> char buf[32];
>
> if (!afu->adapter->debugfs)
> - return -ENODEV;
> + return;
>
> snprintf(buf, 32, "psl%i.%i", afu->adapter->adapter_num, afu->slice);
> dir = debugfs_create_dir(buf, afu->adapter->debugfs);
> - if (IS_ERR(dir))
> - return PTR_ERR(dir);
> afu->debugfs = dir;
>
> debugfs_create_io_x64("sr", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SR_An));
> @@ -118,8 +113,6 @@ int cxl_debugfs_afu_add(struct cxl_afu *afu)
>
> if (afu->adapter->native->sl_ops->debugfs_add_afu_regs)
> afu->adapter->native->sl_ops->debugfs_add_afu_regs(afu, dir);
> -
> - return 0;
> }
>
> void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> @@ -127,19 +120,12 @@ void cxl_debugfs_afu_remove(struct cxl_afu *afu)
> debugfs_remove_recursive(afu->debugfs);
> }
>
> -int __init cxl_debugfs_init(void)
> +void __init cxl_debugfs_init(void)
> {
> - struct dentry *ent;
> -
> if (!cpu_has_feature(CPU_FTR_HVMODE))
> - return 0;
> -
> - ent = debugfs_create_dir("cxl", NULL);
> - if (IS_ERR(ent))
> - return PTR_ERR(ent);
> - cxl_debugfs = ent;
> + return;
>
> - return 0;
> + cxl_debugfs = debugfs_create_dir("cxl", NULL);
> }
>
> void cxl_debugfs_exit(void)
>
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cxl: no need to check return value of debugfs_create functions
2019-06-12 15:54 [PATCH v2] cxl: no need to check return value of debugfs_create functions Greg Kroah-Hartman
` (2 preceding siblings ...)
2019-06-14 8:22 ` Andrew Donnellan
@ 2019-06-30 8:37 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Michael Ellerman @ 2019-06-30 8:37 UTC (permalink / raw)
To: Greg Kroah-Hartman, Frederic Barrat
Cc: linuxppc-dev, Andrew Donnellan, Arnd Bergmann
On Wed, 2019-06-12 at 15:54:18 UTC, Greg Kroah-Hartman wrote:
> 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.
>
> Because there's no need to check, also make the return value of the
> local debugfs_create_io_x64() call void, as no one ever did anything
> with the return value (as they did not need to.)
>
> And make the cxl_debugfs_* calls return void as no one was even checking
> their return value at all.
>
> Cc: Frederic Barrat <fbarrat@linux.ibm.com>
> Cc: Andrew Donnellan <ajd@linux.ibm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
> Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
> Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/1b7de1df997a57e3e144bdb31ceaee9c16d6d284
cheers
^ permalink raw reply [flat|nested] 5+ messages in thread