media: staging: atomisp: cleanup out of memory messages

Logging of explicit out of memory messages is redundant since memory allocation
failures produce a backtrace.

Done with the help of the following cocci script:

@@
expression ex, ret;
statement s;
constant char[] c;
constant err;
identifier f, l;
@@

ex =
\(kmalloc\|kmalloc_array\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|devm_kzalloc\)(...)
... when != ex

if (
(
!ex
|
unlikely(!ex)
)
)
- {
- f(..., c, ...);
(
return ex;
|
return;
|
return err;
|
goto l;
)
- }
else s

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ap1302.c b/drivers/staging/media/atomisp/i2c/atomisp-ap1302.c
index 2f772a0..bfbf851 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ap1302.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ap1302.c
@@ -1153,10 +1153,8 @@ static int ap1302_probe(struct i2c_client *client,
 
        /* allocate device & init sub device */
        dev = devm_kzalloc(&client->dev, sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "%s: out of memory\n", __func__);
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 35ed51f..2915654 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -1385,10 +1385,8 @@ static int gc0310_probe(struct i2c_client *client,
 
        pr_info("%s S\n", __func__);
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index e43d31e..f51535e 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -1123,10 +1123,8 @@ static int gc2235_probe(struct i2c_client *client,
        unsigned int i;
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index 679176f..37876d2 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -871,10 +871,8 @@ static int lm3554_probe(struct i2c_client *client,
        int ret;
 
        flash = kzalloc(sizeof(*flash), GFP_KERNEL);
-       if (!flash) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!flash)
                return -ENOMEM;
-       }
 
        flash->pdata = client->dev.platform_data;
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index 3c837cb..e204238 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1863,10 +1863,8 @@ static int mt9m114_probe(struct i2c_client *client,
 
        /* Setup sensor configuration structure */
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        v4l2_i2c_subdev_init(&dev->sd, client, &mt9m114_ops);
        pdata = client->dev.platform_data;

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 51b7d61..c81e80e 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -1447,10 +1447,8 @@ static int ov2680_probe(struct i2c_client *client,
        unsigned int i;
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 10094ac..5f2e8a2 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -1285,10 +1285,8 @@ static int ov2722_probe(struct i2c_client *client,
        struct acpi_device *adev;
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/imx/imx.c b/drivers/staging/media/atomisp/i2c/imx/imx.c
index 71b6889..885a26c 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/imx/imx.c
+++ b/drivers/staging/media/atomisp/i2c/imx/imx.c
@@ -2364,10 +2364,8 @@ static int imx_probe(struct i2c_client *client,
 
        /* allocate sensor device & init sub device */
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               v4l2_err(client, "%s: out of memory\n", __func__);
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index 2195011..cfdb03f 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -1958,10 +1958,8 @@ static int ov5693_probe(struct i2c_client *client,
        }
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "out of memory\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c
index 43e1638..918139d 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858.c
+++ b/drivers/staging/media/atomisp/i2c/ov8858.c
@@ -480,8 +480,6 @@ static int ov8858_priv_int_data_init(struct v4l2_subdev *sd)
        if (!dev->otp_data) {
                dev->otp_data = devm_kzalloc(&client->dev, size, GFP_KERNEL);
                if (!dev->otp_data) {
-                       dev_err(&client->dev, "%s: can't allocate memory",
-                               __func__);
                        r = -ENOMEM;
                        goto error3;
                }
@@ -2094,10 +2092,8 @@ static int ov8858_probe(struct i2c_client *client,
 
        /* allocate sensor device & init sub device */
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&client->dev, "%s: out of memory\n", __func__);
+       if (!dev)
                return -ENOMEM;
-       }
 
        mutex_init(&dev->input_lock);
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
index d8cfed3..d64c989 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
@@ -1137,10 +1137,8 @@ static int remove_pad_from_frame(struct atomisp_device *isp,
        ia_css_ptr store = load;
 
        buffer = kmalloc(width*sizeof(load), GFP_KERNEL);
-       if (!buffer) {
-               dev_err(isp->dev, "out of memory.\n");
+       if (!buffer)
                return -ENOMEM;
-       }
 
        load += ISP_LEFT_PAD;
        for (i = 0; i < height; i++) {

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
index dd59167..ccb78f0 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
@@ -942,10 +942,8 @@ int atomisp_alloc_css_stat_bufs(struct atomisp_sub_device *asd,
                dev_dbg(isp->dev, "allocating %d 3a buffers\n", count);
                while (count--) {
                        s3a_buf = kzalloc(sizeof(struct atomisp_s3a_buf), GFP_KERNEL);
-                       if (!s3a_buf) {
-                               dev_err(isp->dev, "s3a stat buf alloc failed\n");
+                       if (!s3a_buf)
                                goto error;
-                       }
 
                        if (atomisp_css_allocate_stat_buffers(
                                        asd, stream_id, s3a_buf, NULL, NULL)) {
@@ -964,7 +962,6 @@ int atomisp_alloc_css_stat_bufs(struct atomisp_sub_device *asd,
                while (count--) {
                        dis_buf = kzalloc(sizeof(struct atomisp_dis_buf), GFP_KERNEL);
                        if (!dis_buf) {
-                               dev_err(isp->dev, "dis stat buf alloc failed\n");
                                kfree(s3a_buf);
                                goto error;
                        }
@@ -989,10 +986,8 @@ int atomisp_alloc_css_stat_bufs(struct atomisp_sub_device *asd,
                        while (count--) {
                                md_buf = kzalloc(sizeof(struct atomisp_metadata_buf),
                                                 GFP_KERNEL);
-                               if (!md_buf) {
-                                       dev_err(isp->dev, "metadata buf alloc failed\n");
+                               if (!md_buf)
                                        goto error;
-                               }
 
                                if (atomisp_css_allocate_stat_buffers(
                                                asd, stream_id, NULL, NULL, md_buf)) {

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 48e2e63..e6ebd1b 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,10 +365,8 @@ ia_css_shading_table_alloc(
        IA_CSS_ENTER("");
 
        me = kmalloc(sizeof(*me), GFP_KERNEL);
-       if (!me) {
-               IA_CSS_ERROR("out of memory");
+       if (!me)
                return me;
-       }
 
        me->width         = width;
        me->height        = height;

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
index 8007b6f..12c96c4 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
@@ -727,10 +727,8 @@ static int alloc_private_pages(struct hmm_buffer_object *bo,
 
        bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * pgnr,
                                GFP_KERNEL);
-       if (unlikely(!bo->page_obj)) {
-               dev_err(atomisp_dev, "out of memory for bo->page_obj\n");
+       if (unlikely(!bo->page_obj))
                return -ENOMEM;
-       }
 
        i = 0;
        alloc_pgnr = 0;
@@ -991,15 +989,12 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
        struct page **pages;
 
        pages = kmalloc(sizeof(struct page *) * bo->pgnr, GFP_KERNEL);
-       if (unlikely(!pages)) {
-               dev_err(atomisp_dev, "out of memory for pages...\n");
+       if (unlikely(!pages))
                return -ENOMEM;
-       }
 
        bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * bo->pgnr,
                GFP_KERNEL);
        if (unlikely(!bo->page_obj)) {
-               dev_err(atomisp_dev, "out of memory for bo->page_obj...\n");
                kfree(pages);
                return -ENOMEM;
        }
@@ -1362,7 +1357,6 @@ void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached)
        pages = kmalloc(sizeof(*pages) * bo->pgnr, GFP_KERNEL);
        if (unlikely(!pages)) {
                mutex_unlock(&bo->mutex);
-               dev_err(atomisp_dev, "out of memory for pages...\n");
                return NULL;
        }
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c
index 19e0e9e..eb82c3e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c
@@ -116,8 +116,6 @@ static void free_pages_to_dynamic_pool(void *pool,
        hmm_page = kmem_cache_zalloc(dypool_info->pgptr_cache,
                                                GFP_KERNEL);
        if (!hmm_page) {
-               dev_err(atomisp_dev, "out of memory for hmm_page.\n");
-
                /* free page directly */
                ret = set_pages_wb(page_obj->page, 1);
                if (ret)
@@ -151,10 +149,8 @@ static int hmm_dynamic_pool_init(void **pool, unsigned int pool_size)
 
        dypool_info = kmalloc(sizeof(struct hmm_dynamic_pool_info),
                GFP_KERNEL);
-       if (unlikely(!dypool_info)) {
-               dev_err(atomisp_dev, "out of memory for repool_info.\n");
+       if (unlikely(!dypool_info))
                return -ENOMEM;
-       }
 
        dypool_info->pgptr_cache = kmem_cache_create("pgptr_cache",
                                                sizeof(struct hmm_page), 0,

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c
index bf65868..177bc35 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c
@@ -92,15 +92,12 @@ static int hmm_reserved_pool_setup(struct hmm_reserved_pool_info **repool_info,
 
        pool_info = kmalloc(sizeof(struct hmm_reserved_pool_info),
                                GFP_KERNEL);
-       if (unlikely(!pool_info)) {
-               dev_err(atomisp_dev, "out of memory for repool_info.\n");
+       if (unlikely(!pool_info))
                return -ENOMEM;
-       }
 
        pool_info->pages = kmalloc(sizeof(struct page *) * pool_size,
                        GFP_KERNEL);
        if (unlikely(!pool_info->pages)) {
-               dev_err(atomisp_dev, "out of memory for repool_info->pages.\n");
                kfree(pool_info);
                return -ENOMEM;
        }

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c
index 0722a68..402ffd9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c
@@ -89,10 +89,8 @@ static struct hmm_vm_node *alloc_hmm_vm_node(unsigned int pgnr,
        struct hmm_vm_node *node;
 
        node = kmem_cache_alloc(vm->cache, GFP_KERNEL);
-       if (!node) {
-               dev_err(atomisp_dev, "out of memory.\n");
+       if (!node)
                return NULL;
-       }
 
        INIT_LIST_HEAD(&node->list);
        node->pgnr = pgnr;

diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
index 8a20a28..8c6a26e 100644 (file)
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -785,10 +785,8 @@ int camera_sensor_csi(struct v4l2_subdev *sd, u32 port,
 
        if (flag) {
                csi = kzalloc(sizeof(*csi), GFP_KERNEL);
-               if (!csi) {
-                       dev_err(&client->dev, "out of memory\n");
+               if (!csi)
                        return -ENOMEM;
-               }
                csi->port = port;
                csi->num_lanes = lanes;
                csi->input_format = format;