media: staging: atomisp2: cleanup null check on memory allocation

For memory allocation functions that fail with a NULL return value, it
is preferred to use the (!x) test in place of (x == NULL).

Changes in atomisp2/css2400/sh_css.c were done by hand.

Done with the help of the following cocci script:

@@
type T;
T* p;
statement s,s1;
@@

p =
  \(devm_kzalloc\|devm_ioremap\|usb_alloc_urb\|alloc_netdev\|dev_alloc_skb\|
   kmalloc\|kmalloc_array\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|devm_kzalloc\)(...)
...when != p

if (
- p == NULL
+ !p
 ) s
 else s1

--
Changes in v3:
  Rebase changes over atomisp-next branch of the media tree
Changes in atomisp2/css2400/sh_css.c were done by hand, the above script
was not able to match the pattern if (a->b != null).

Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index bee30438e6fddcfb91c456041e2e4dce39437fe8..e61009faff279cd48777281ba2dc597435659a95 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -5605,13 +5605,13 @@ static enum ia_css_err load_video_binaries(struct ia_css_pipe *pipe)
                mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
                mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
                        sizeof(struct ia_css_binary), GFP_KERNEL);
-               if (mycs->yuv_scaler_binary == NULL) {
+               if (!mycs->yuv_scaler_binary) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        return err;
                }
                mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage
                                        * sizeof(bool), GFP_KERNEL);
-               if (mycs->is_output_stage == NULL) {
+               if (!mycs->is_output_stage) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        return err;
                }
@@ -6256,14 +6256,14 @@ static enum ia_css_err load_primary_binaries(
                mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
                mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
                        sizeof(struct ia_css_binary), GFP_KERNEL);
-               if (mycs->yuv_scaler_binary == NULL) {
+               if (!mycs->yuv_scaler_binary) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        IA_CSS_LEAVE_ERR_PRIVATE(err);
                        return err;
                }
                mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage *
                        sizeof(bool), GFP_KERNEL);
-               if (mycs->is_output_stage == NULL) {
+               if (!mycs->is_output_stage) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        IA_CSS_LEAVE_ERR_PRIVATE(err);
                        return err;
@@ -6980,27 +6980,27 @@ static enum ia_css_err ia_css_pipe_create_cas_scaler_desc_single_output(
        }
 
        descr->in_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->in_info == NULL) {
+       if (!descr->in_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->internal_out_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->internal_out_info == NULL) {
+       if (!descr->internal_out_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->out_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->out_info == NULL) {
+       if (!descr->out_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->vf_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->vf_info == NULL) {
+       if (!descr->vf_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->is_output_stage = kmalloc(descr->num_stage * sizeof(bool), GFP_KERNEL);
-       if (descr->is_output_stage == NULL) {
+       if (!descr->is_output_stage) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
@@ -7116,22 +7116,22 @@ static enum ia_css_err ia_css_pipe_create_cas_scaler_desc(struct ia_css_pipe *pi
        descr->num_stage = num_stages;
 
        descr->in_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->in_info == NULL) {
+       if (!descr->in_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->internal_out_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->internal_out_info == NULL) {
+       if (!descr->internal_out_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->out_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->out_info == NULL) {
+       if (!descr->out_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
        descr->vf_info = kmalloc(descr->num_stage * sizeof(struct ia_css_frame_info), GFP_KERNEL);
-       if (descr->vf_info == NULL) {
+       if (!descr->vf_info) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
@@ -7274,13 +7274,13 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
                mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
                mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
                        sizeof(struct ia_css_binary), GFP_KERNEL);
-               if (mycs->yuv_scaler_binary == NULL) {
+               if (!mycs->yuv_scaler_binary) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        goto ERR;
                }
                mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage *
                        sizeof(bool), GFP_KERNEL);
-               if (mycs->is_output_stage == NULL) {
+               if (!mycs->is_output_stage) {
                        err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                        goto ERR;
                }
@@ -7381,7 +7381,7 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
        }
        mycs->vf_pp_binary = kzalloc(mycs->num_vf_pp * sizeof(struct ia_css_binary),
                                                GFP_KERNEL);
-       if (mycs->vf_pp_binary == NULL) {
+       if (!mycs->vf_pp_binary) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                goto ERR;
        }
@@ -9443,7 +9443,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
 
        /* allocate the stream instance */
        curr_stream = kmalloc(sizeof(struct ia_css_stream), GFP_KERNEL);
-       if (curr_stream == NULL) {
+       if (!curr_stream) {
                err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
                IA_CSS_LEAVE_ERR(err);
                return err;
@@ -9455,7 +9455,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
        /* allocate pipes */
        curr_stream->num_pipes = num_pipes;
        curr_stream->pipes = kzalloc(num_pipes * sizeof(struct ia_css_pipe *), GFP_KERNEL);
-       if (curr_stream->pipes == NULL) {
+       if (!curr_stream->pipes) {
                curr_stream->num_pipes = 0;
                kfree(curr_stream);
                curr_stream = NULL;

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
index 5e45d5fe0b2a73070c17c4b024b05e0cb8bf35f1..383d236c010c225a1769866ec0970b7d894fffa2 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
@@ -147,7 +147,7 @@ sh_css_load_blob_info(const char *fw, const struct ia_css_fw_info *bi, struct ia
 
                char *parambuf = kmalloc(paramstruct_size + configstruct_size + statestruct_size,
                                                        GFP_KERNEL);
-               if (parambuf == NULL)
+               if (!parambuf)
                        return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
 
                bd->mem_offsets.array[IA_CSS_PARAM_CLASS_PARAM].ptr = NULL;
@@ -229,7 +229,7 @@ sh_css_load_firmware(const char *fw_data,
                sh_css_blob_info = kmalloc(
                                        (sh_css_num_binaries - NUM_OF_SPS) *
                                        sizeof(*sh_css_blob_info), GFP_KERNEL);
-               if (sh_css_blob_info == NULL)
+               if (!sh_css_blob_info)
                        return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
        } else {
                sh_css_blob_info = NULL;
@@ -237,8 +237,7 @@ sh_css_load_firmware(const char *fw_data,
 
        fw_minibuffer = kcalloc(sh_css_num_binaries, sizeof(struct fw_param),
                                GFP_KERNEL);
-
-       if (fw_minibuffer == NULL)
+       if (!fw_minibuffer)
                return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
 
        for (i = 0; i < sh_css_num_binaries; i++) {

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c
index eaf60e7b2dacf733081280d98c21d2b8e0f65e9a..48e2e63c2336383f2677b368579708a5b9be5938 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c
@@ -365,7 +365,7 @@ ia_css_shading_table_alloc(
        IA_CSS_ENTER("");
 
        me = kmalloc(sizeof(*me), GFP_KERNEL);
-       if (me == NULL) {
+       if (!me) {
                IA_CSS_ERROR("out of memory");
                return me;
        }