OSDN Git Service

media: media/pci: simplify the return expression of verify_window_lock
authorLiu Shixin <liushixin2@huawei.com>
Mon, 21 Sep 2020 08:24:39 +0000 (10:24 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 16 Nov 2020 09:31:15 +0000 (10:31 +0100)
Simplify the return expression.

Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/pci/bt8xx/bttv-driver.c

index ef2ead3..956a12e 100644 (file)
@@ -2058,7 +2058,6 @@ verify_window_lock(struct bttv_fh *fh, struct v4l2_window *win,
 {
        enum v4l2_field field;
        unsigned int width_mask;
-       int rc;
 
        if (win->w.width < 48)
                win->w.width = 48;
@@ -2111,13 +2110,10 @@ verify_window_lock(struct bttv_fh *fh, struct v4l2_window *win,
        win->w.width -= win->w.left & ~width_mask;
        win->w.left = (win->w.left - width_mask - 1) & width_mask;
 
-       rc = limit_scaled_size_lock(fh, &win->w.width, &win->w.height,
-                              field, width_mask,
-                              /* width_bias: round down */ 0,
-                              adjust_size, adjust_crop);
-       if (0 != rc)
-               return rc;
-       return 0;
+       return limit_scaled_size_lock(fh, &win->w.width, &win->w.height,
+                                     field, width_mask,
+                                     /* width_bias: round down */ 0,
+                                     adjust_size, adjust_crop);
 }
 
 static int setup_window_lock(struct bttv_fh *fh, struct bttv *btv,