Commit 3249888c authored by Soumya Negi's avatar Soumya Negi Committed by Greg Kroah-Hartman

staging: vme_user: Use dev_err() in vme_check_window()

vme_check_window() uses printk() for logging error message. This
leads to the following checkpatch warning:
   WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then
            dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Use dev_err() instead. Pass VME bridge device to vme_check_window() so
that the error message can be logged with the bridge device context.
Signed-off-by: default avatarSoumya Negi <soumya.negi97@gmail.com>
Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/221344ede933b1d9e6c31310b0f4dbb8be809c86.1697763267.git.soumya.negi97@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6054f43
...@@ -160,8 +160,8 @@ size_t vme_get_size(struct vme_resource *resource) ...@@ -160,8 +160,8 @@ size_t vme_get_size(struct vme_resource *resource)
} }
EXPORT_SYMBOL(vme_get_size); EXPORT_SYMBOL(vme_get_size);
int vme_check_window(u32 aspace, unsigned long long vme_base, int vme_check_window(struct vme_bridge *bridge, u32 aspace,
unsigned long long size) unsigned long long vme_base, unsigned long long size)
{ {
int retval = 0; int retval = 0;
...@@ -195,7 +195,7 @@ int vme_check_window(u32 aspace, unsigned long long vme_base, ...@@ -195,7 +195,7 @@ int vme_check_window(u32 aspace, unsigned long long vme_base,
/* User Defined */ /* User Defined */
break; break;
default: default:
printk(KERN_ERR "Invalid address space\n"); dev_err(bridge->parent, "Invalid address space\n");
retval = -EINVAL; retval = -EINVAL;
break; break;
} }
...@@ -350,7 +350,7 @@ int vme_slave_set(struct vme_resource *resource, int enabled, ...@@ -350,7 +350,7 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
return -EINVAL; return -EINVAL;
} }
retval = vme_check_window(aspace, vme_base, size); retval = vme_check_window(bridge, aspace, vme_base, size);
if (retval) if (retval)
return retval; return retval;
...@@ -552,7 +552,7 @@ int vme_master_set(struct vme_resource *resource, int enabled, ...@@ -552,7 +552,7 @@ int vme_master_set(struct vme_resource *resource, int enabled,
return -EINVAL; return -EINVAL;
} }
retval = vme_check_window(aspace, vme_base, size); retval = vme_check_window(bridge, aspace, vme_base, size);
if (retval) if (retval)
return retval; return retval;
......
...@@ -133,8 +133,8 @@ void vme_free_consistent(struct vme_resource *, size_t, void *, ...@@ -133,8 +133,8 @@ void vme_free_consistent(struct vme_resource *, size_t, void *,
dma_addr_t); dma_addr_t);
size_t vme_get_size(struct vme_resource *); size_t vme_get_size(struct vme_resource *);
int vme_check_window(u32 aspace, unsigned long long vme_base, int vme_check_window(struct vme_bridge *bridge, u32 aspace,
unsigned long long size); unsigned long long vme_base, unsigned long long size);
struct vme_resource *vme_slave_request(struct vme_dev *, u32, u32); struct vme_resource *vme_slave_request(struct vme_dev *, u32, u32);
int vme_slave_set(struct vme_resource *, int, unsigned long long, int vme_slave_set(struct vme_resource *, int, unsigned long long,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment