media: staging: media: zoran: multiple assignments should be avoided

Remove all multiple assignments.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c
index e8902f8..46382e4 100644 (file)
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -678,12 +678,14 @@ static int zoran_g_selection(struct file *file, void *__fh, struct v4l2_selectio
                sel->r.height = zr->jpg_settings.img_height;
                break;
        case V4L2_SEL_TGT_CROP_DEFAULT:
-               sel->r.top = sel->r.left = 0;
+               sel->r.top = 0;
+               sel->r.left = 0;
                sel->r.width = BUZ_MIN_WIDTH;
                sel->r.height = BUZ_MIN_HEIGHT;
                break;
        case V4L2_SEL_TGT_CROP_BOUNDS:
-               sel->r.top = sel->r.left = 0;
+               sel->r.top = 0;
+               sel->r.left = 0;
                sel->r.width = BUZ_MAX_WIDTH;
                sel->r.height = BUZ_MAX_HEIGHT;
                break;

diff --git a/drivers/staging/media/zoran/zr36016.c b/drivers/staging/media/zoran/zr36016.c
index 2d7dc7a..82702a1 100644 (file)
--- a/drivers/staging/media/zoran/zr36016.c
+++ b/drivers/staging/media/zoran/zr36016.c
@@ -361,7 +361,8 @@ static int zr36016_setup(struct videocodec *codec)
                return -ENOSPC;
        }
        //mem structure init
-       codec->data = ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);
+       ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);
+       codec->data = ptr;
        if (!ptr)
                return -ENOMEM;
 

diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c
index 2826f4e..a788628 100644 (file)
--- a/drivers/staging/media/zoran/zr36050.c
+++ b/drivers/staging/media/zoran/zr36050.c
@@ -754,7 +754,8 @@ static int zr36050_setup(struct videocodec *codec)
                return -ENOSPC;
        }
        //mem structure init
-       codec->data = ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);
+       ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);
+       codec->data = ptr;
        if (!ptr)
                return -ENOMEM;
 

diff --git a/drivers/staging/media/zoran/zr36060.c b/drivers/staging/media/zoran/zr36060.c
index 4f9eb9f..1c3af11 100644 (file)
--- a/drivers/staging/media/zoran/zr36060.c
+++ b/drivers/staging/media/zoran/zr36060.c
@@ -790,7 +790,8 @@ static int zr36060_setup(struct videocodec *codec)
                return -ENOSPC;
        }
        //mem structure init
-       codec->data = ptr = kzalloc(sizeof(*ptr), GFP_KERNEL);
+       ptr = kzalloc(sizeof(*ptr), GFP_KERNEL);
+       codec->data = ptr;
        if (!ptr)
                return -ENOMEM;