Skip to contentSkip to conversation

staging:vme_user:fix the issue of using the wrong error code

PATCH Superseded Piro Yang 2 participants 4 messages Dec 11, 2023

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Piro Yang

author
#0 lore raw

PATCH 1/1 staging:vme_user:fix the issue of using the wrong error code

1. the error code of ENOSYS indicates Invalid system call number, but there is not system call

2. unified the logging error message, when slave_set func is NULL

---
 drivers/staging/vme_user/vme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vme_user/vme.c +2 -2
index 5c416c31ec57..e9461a7a7ab8 100644
@@ -340,8 +340,8 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
 	image = list_entry(resource->entry, struct vme_slave_resource, list);
 
 	if (!bridge->slave_set) {
-		dev_err(bridge->parent, "Function not supported\n");
-		return -ENOSYS;
+		dev_err(bridge->parent, "%s not supported\n", __func__);
+		return -EINVAL;
 	}
 
 	if (!(((image->address_attr & aspace) == aspace) &&
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 4 lines · Piro Yang

1. the error code of ENOSYS indicates Invalid system call number, but there is not system call

2. unified the logging error message, when slave_set func is NULL

That is two different things, and as such, should be two different changes, right?

Yes, it's picky, but that's what the staging driver code is for, to get comfortable doing kernel development changes properly.

Also, are you sure this second change is correct:

Quoted 11 lines
---
 drivers/staging/vme_user/vme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vme_user/vme.c +0 -0
index 5c416c31ec57..e9461a7a7ab8 100644

drivers/staging/vme_user/vme.c int vme_slave_set(struct vme_resource *resource, int enabled, · line 343

Quoted 6 lines
drivers/staging/vme_user/vme.c +1 -2
@@ -340,8 +340,8 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
 	image = list_entry(resource->entry, struct vme_slave_resource, list);
 
 	if (!bridge->slave_set) {
-		dev_err(bridge->parent, "Function not supported\n");
-		return -ENOSYS;
+		dev_err(bridge->parent, "%s not supported\n", __func__);

__func__ is not the same here as "Function", right? "Function" is the functionality of the thing that is attempted here, so replacing that word with the function name seems odd to me, don't you think?

thanks,

greg k-h

author
#2 lore raw
Quoted 7 lines · Greg KH <[email protected]> 于2023年12月12日周二 00:01写道:
Quoted 4 lines · Piro Yang

1. the error code of ENOSYS indicates Invalid system call number, but there is not system call

2. unified the logging error message, when slave_set func is NULL

Quoted 7 lines

That is two different things, and as such, should be two different changes, right?

Yes, it's picky, but that's what the staging driver code is for, to get comfortable doing kernel development changes properly.

Also, are you sure this second change is correct:

yes, I'm sure .
the vme_slave_set function is diffierent
/*****************************vme_slave_set***********************/ int vme_slave_set(struct vme_resource *resource, int enabled,
unsigned long long vme_base, unsigned long long size, dma_addr_t buf_base, u32 aspace, u32 cycle)

{
        ...
        if (!bridge->slave_set) {
                 dev_err(bridge->parent, "Function not supported\n");
                return -ENOSYS;
        }

/******************other functions like below: *******************/ int vme_slave_get(struct vme_resource *resource, int *enabled,
unsigned long long *vme_base, unsigned long long *size, dma_addr_t *buf_base, u32 *aspace, u32 *cycle)

{
        ....
        if (!bridge->slave_get) {
                dev_err(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }

int vme_master_set(struct vme_resource *resource, int enabled,
unsigned long long vme_base, unsigned long long size, u32 aspace, u32 cycle, u32 dwidth)

{
       ....
        if (!bridge->master_set) {
                dev_warn(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }

int vme_master_get(struct vme_resource *resource, int *enabled,
unsigned long long *vme_base, unsigned long long *size, u32 *aspace, u32 *cycle, u32 *dwidth)

{
      ....
        if (!bridge->master_get) {
                dev_warn(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }
Quoted 26 lines
Quoted 12 lines
---
 drivers/staging/vme_user/vme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vme_user/vme.c +0 -0
index 5c416c31ec57..e9461a7a7ab8 100644

drivers/staging/vme_user/vme.c int vme_slave_set(struct vme_resource *resource, int enabled, · line 343

Quoted 6 lines
drivers/staging/vme_user/vme.c +1 -2
@@ -340,8 +340,8 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
      image = list_entry(resource->entry, struct vme_slave_resource, list);
 
      if (!bridge->slave_set) {
-             dev_err(bridge->parent, "Function not supported\n");
-             return -ENOSYS;
+             dev_err(bridge->parent, "%s not supported\n", __func__);

__func__ is not the same here as "Function", right? "Function" is the functionality of the thing that is attempted here, so replacing that word with the function name seems odd to me, don't you think?

thanks,

greg k-h

author
#3 lore raw
Quoted 54 lines · piro yang <[email protected]> 于2023年12月12日周二 00:13写道:
Quoted 7 lines · Greg KH <[email protected]> 于2023年12月12日周二 00:01写道:
Quoted 4 lines · Piro Yang

1. the error code of ENOSYS indicates Invalid system call number, but there is not system call

2. unified the logging error message, when slave_set func is NULL

Quoted 7 lines

That is two different things, and as such, should be two different changes, right?

Yes, it's picky, but that's what the staging driver code is for, to get comfortable doing kernel development changes properly.

Also, are you sure this second change is correct:

yes, I'm sure .
the vme_slave_set function is diffierent
/*****************************vme_slave_set***********************/ int vme_slave_set(struct vme_resource *resource, int enabled,
unsigned long long vme_base, unsigned long long size, dma_addr_t buf_base, u32 aspace, u32 cycle)

{
        ...
        if (!bridge->slave_set) {
                 dev_err(bridge->parent, "Function not supported\n");
                return -ENOSYS;
        }

/******************other functions like below: *******************/ int vme_slave_get(struct vme_resource *resource, int *enabled,
unsigned long long *vme_base, unsigned long long *size, dma_addr_t *buf_base, u32 *aspace, u32 *cycle)

{
        ....
        if (!bridge->slave_get) {
                dev_err(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }

int vme_master_set(struct vme_resource *resource, int enabled,
unsigned long long vme_base, unsigned long long size, u32 aspace, u32 cycle, u32 dwidth)

{
       ....
        if (!bridge->master_set) {
                dev_warn(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }

int vme_master_get(struct vme_resource *resource, int *enabled,
unsigned long long *vme_base, unsigned long long *size, u32 *aspace, u32 *cycle, u32 *dwidth)

Quoted 30 lines
{
      ....
        if (!bridge->master_get) {
                dev_warn(bridge->parent, "%s not supported\n", __func__);
                return -EINVAL;
        }
Quoted 23 lines
Quoted 12 lines
---
 drivers/staging/vme_user/vme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vme_user/vme.c +0 -0
index 5c416c31ec57..e9461a7a7ab8 100644

drivers/staging/vme_user/vme.c int vme_slave_set(struct vme_resource *resource, int enabled, · line 343

Quoted 6 lines
drivers/staging/vme_user/vme.c +1 -2
@@ -340,8 +340,8 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
      image = list_entry(resource->entry, struct vme_slave_resource, list);
 
      if (!bridge->slave_set) {
-             dev_err(bridge->parent, "Function not supported\n");
-             return -ENOSYS;
+             dev_err(bridge->parent, "%s not supported\n", __func__);

__func__ is not the same here as "Function", right? "Function" is the functionality of the thing that is attempted here, so replacing that word with the function name seems odd to me, don't you think?

yes, __func__ is not the same here as "Function". but I think the logging error message format shoud be unified
with other functions.

    like:  vme_slave_get(){
             .....
             if (!bridge->slave_get) {
                dev_err(bridge->parent, "%s not supported\n", __func__);
Quoted 3 lines
Quoted 3 lines

thanks,

greg k-h