Commit f4f5e507 authored by Jinpeng Cui's avatar Jinpeng Cui Committed by Alex Deucher

drm/amdkfd: remove redundant variables err and ret

Return value from kfd_wait_on_events() and io_remap_pfn_range() directly
instead of taking this in another redundant variable.
Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarJinpeng Cui <cui.jinpeng2@zte.com.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74d83404
...@@ -876,14 +876,11 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p, ...@@ -876,14 +876,11 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p,
void *data) void *data)
{ {
struct kfd_ioctl_wait_events_args *args = 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, (void __user *)args->events_ptr,
(args->wait_for_all != 0), (args->wait_for_all != 0),
&args->timeout, &args->wait_result); &args->timeout, &args->wait_result);
return err;
} }
static int kfd_ioctl_set_scratch_backing_va(struct file *filep, static int kfd_ioctl_set_scratch_backing_va(struct file *filep,
struct kfd_process *p, void *data) struct kfd_process *p, void *data)
...@@ -2860,7 +2857,6 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process, ...@@ -2860,7 +2857,6 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
phys_addr_t address; phys_addr_t address;
int ret;
if (vma->vm_end - vma->vm_start != PAGE_SIZE) if (vma->vm_end - vma->vm_start != PAGE_SIZE)
return -EINVAL; return -EINVAL;
...@@ -2880,12 +2876,11 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process, ...@@ -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, process->pasid, (unsigned long long) vma->vm_start,
address, vma->vm_flags, PAGE_SIZE); address, vma->vm_flags, PAGE_SIZE);
ret = io_remap_pfn_range(vma, return io_remap_pfn_range(vma,
vma->vm_start, vma->vm_start,
address >> PAGE_SHIFT, address >> PAGE_SHIFT,
PAGE_SIZE, PAGE_SIZE,
vma->vm_page_prot); vma->vm_page_prot);
return ret;
} }
......
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