2022-08-29 12:59:09

by CGEL

Subject: [PATCH linux-next] drm/amdkfd: remove redundant variables err and ret

From: Jinpeng Cui <[email protected]>

Return value from kfd_wait_on_events() and io_remap_pfn_range() directly
instead of taking this in another redundant variable.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Jinpeng Cui <[email protected]>
---
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 664e8b5d82c0..84da1a9ce37c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -876,14 +876,11 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p,
void *data)
{
struct kfd_ioctl_wait_events_args *args = data;
- int err;

- err = kfd_wait_on_events(p, args->num_events,
+ return kfd_wait_on_events(p, args->num_events,
(void __user *)args->events_ptr,
(args->wait_for_all != 0),
&args->timeout, &args->wait_result);
-
- return err;
}
static int kfd_ioctl_set_scratch_backing_va(struct file *filep,
struct kfd_process *p, void *data)
@@ -2860,7 +2857,6 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process,
struct vm_area_struct *vma)
{
phys_addr_t address;
- int ret;

if (vma->vm_end - vma->vm_start != PAGE_SIZE)
return -EINVAL;
@@ -2880,12 +2876,11 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process,
process->pasid, (unsigned long long) vma->vm_start,
address, vma->vm_flags, PAGE_SIZE);

- ret = io_remap_pfn_range(vma,
+ return io_remap_pfn_range(vma,
vma->vm_start,
address >> PAGE_SHIFT,
PAGE_SIZE,
vma->vm_page_prot);
- return ret;
}


--
2.25.1

2022-08-29 19:50:39

by Alex Deucher

Subject: Re: [PATCH linux-next] drm/amdkfd: remove redundant variables err and ret

Applied. Thanks!

Alex

On Mon, Aug 29, 2022 at 8:29 AM <[email protected]> wrote:
>
> From: Jinpeng Cui <[email protected]>
>
> Return value from kfd_wait_on_events() and io_remap_pfn_range() directly
> instead of taking this in another redundant variable.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Jinpeng Cui <[email protected]>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 664e8b5d82c0..84da1a9ce37c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -876,14 +876,11 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p,
> void *data)
> {
> struct kfd_ioctl_wait_events_args *args = data;
> - int err;
>
> - err = kfd_wait_on_events(p, args->num_events,
> + return kfd_wait_on_events(p, args->num_events,
> (void __user *)args->events_ptr,
> (args->wait_for_all != 0),
> &args->timeout, &args->wait_result);
> -
> - return err;
> }
> static int kfd_ioctl_set_scratch_backing_va(struct file *filep,
> struct kfd_process *p, void *data)
> @@ -2860,7 +2857,6 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process,
> struct vm_area_struct *vma)
> {
> phys_addr_t address;
> - int ret;
>
> if (vma->vm_end - vma->vm_start != PAGE_SIZE)
> return -EINVAL;
> @@ -2880,12 +2876,11 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process,
> process->pasid, (unsigned long long) vma->vm_start,
> address, vma->vm_flags, PAGE_SIZE);
>
> - ret = io_remap_pfn_range(vma,
> + return io_remap_pfn_range(vma,
> vma->vm_start,
> address >> PAGE_SHIFT,
> PAGE_SIZE,
> vma->vm_page_prot);
> - return ret;
> }
>
>
> --
> 2.25.1
>