media: vivid: use vmalloc_array and vcalloc to simplify code

Remove array_size() calls and replace vmalloc(array_size()) with
vmalloc_array() and vzalloc(array_size()) with vcalloc() to simplify
the code.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c
index 86506be36acb0cfacede5f000b95c0bc491ab5a8..9c0b1a32b5c915be6479952841c0f53cd6ac69e1 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-core.c
+++ b/drivers/media/test-drivers/vivid/vivid-core.c
@@ -1856,15 +1856,15 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
        tpg_init(&dev->tpg, 640, 360);
        if (tpg_alloc(&dev->tpg, array_size(MAX_WIDTH, MAX_ZOOM)))
                goto free_dev;
-       dev->scaled_line = vzalloc(array_size(MAX_WIDTH, MAX_ZOOM));
+       dev->scaled_line = vcalloc(MAX_WIDTH, MAX_ZOOM);
        if (!dev->scaled_line)
                goto free_dev;
-       dev->blended_line = vzalloc(array_size(MAX_WIDTH, MAX_ZOOM));
+       dev->blended_line = vcalloc(MAX_WIDTH, MAX_ZOOM);
        if (!dev->blended_line)
                goto free_dev;
 
        /* load the edid */
-       dev->edid = vmalloc(array_size(256, 128));
+       dev->edid = vmalloc_array(256, 128);
        if (!dev->edid)
                goto free_dev;