habanalabs: make code more concise

Instead of doing if inside if, just write them with && operator.

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Reviewed-by: Omer Shpigelman <oshpigelman@habana.ai>

diff --git a/drivers/misc/habanalabs/habanalabs_ioctl.c b/drivers/misc/habanalabs/habanalabs_ioctl.c
index 02d7491fa28fd785e39ddc20bc519139ec6c6c95..5d9c269d99db0712df2f0ee963ad76b4e53442ae 100644 (file)
--- a/drivers/misc/habanalabs/habanalabs_ioctl.c
+++ b/drivers/misc/habanalabs/habanalabs_ioctl.c
@@ -60,7 +60,7 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args)
        hw_ip.tpc_enabled_mask = prop->tpc_enabled_mask;
        hw_ip.sram_size = prop->sram_size - sram_kmd_size;
        hw_ip.dram_size = prop->dram_size - dram_kmd_size;
-       if (hw_ip.dram_size > 0)
+       if (hw_ip.dram_size > PAGE_SIZE)
                hw_ip.dram_enabled = 1;
        hw_ip.num_of_events = prop->num_of_events;
 
@@ -184,17 +184,14 @@ static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args)
                goto out;
        }
 
-       if (output) {
-               if (copy_to_user((void __user *) (uintptr_t) args->output_ptr,
-                                       output,
-                                       args->output_size)) {
-                       dev_err(hdev->dev,
-                               "copy to user failed in debug ioctl\n");
-                       rc = -EFAULT;
-                       goto out;
-               }
+       if (output && copy_to_user((void __user *) (uintptr_t) args->output_ptr,
+                                       output, args->output_size)) {
+               dev_err(hdev->dev, "copy to user failed in debug ioctl\n");
+               rc = -EFAULT;
+               goto out;
        }
 
+
 out:
        kfree(params);
        kfree(output);
@@ -434,9 +431,8 @@ static long _hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg,
 
        retcode = func(hpriv, kdata);
 
-       if (cmd & IOC_OUT)
-               if (copy_to_user((void __user *)arg, kdata, usize))
-                       retcode = -EFAULT;
+       if ((cmd & IOC_OUT) && copy_to_user((void __user *)arg, kdata, usize))
+               retcode = -EFAULT;
 
 out_err:
        if (retcode)