From patchwork Tue Mar 28 10:02:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9648709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8460F602C8 for ; Tue, 28 Mar 2017 10:04:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80DA520700 for ; Tue, 28 Mar 2017 10:04:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 754DD2837F; Tue, 28 Mar 2017 10:04:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC24E20700 for ; Tue, 28 Mar 2017 10:04:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754406AbdC1KEB (ORCPT ); Tue, 28 Mar 2017 06:04:01 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:63888 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753990AbdC1KEA (ORCPT ); Tue, 28 Mar 2017 06:04:00 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0M5ZBQ-1bvbbt1pw8-00xXPG; Tue, 28 Mar 2017 12:03:29 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox Cc: Arnd Bergmann , Varsha Rao , sayli karnik , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: atomisp: avoid false-positive maybe-uninitialized warning Date: Tue, 28 Mar 2017 12:02:20 +0200 Message-Id: <20170328100321.3836826-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:B1I2oBUjyfcDwC3Tp3SHxgzw1zmsioNLCXydwq+fO7sB3gtKJfc PTI3ZvQcwqXSGH0c2dl1cmMV6/QvkBsAJEmmkkW0ywtMN+xxnKrDE/GiR4yf8KiRs0UkKdU ESj+G69oh6tLjF0V7aSWG0Ypj3zbWa8nbUnNcDQhVZO0RP2uPbJWqykHwnNDCXvS+uQ5Ab1 3xVU3MAhG+/HVZj9pDFRw== X-UI-Out-Filterresults: notjunk:1; V01:K0:VhIeLuTg0fA=:7Mq2fi4uhdbYjeFL27zypu 2mMYeGsc1Hbyygdgc0HIRrzsHQ/vNThziNkI4afofSBM5/Hh7BYlT4/6flQszIOLH45RTsNpf snJ5pBYjIEdeeDu0q1yD+hWa0eOPLK3ldP5QgVkm+M3j9OCOF6VdM/Lluiov26xGqmvwBoNYs xHR/+7fuv1oaoYKwnWObeYBHEu+FVxWeZofF8j4EZValT6Az6XYRejrcYzL0xyGI+I/L0ehHM cp5eiqsE0dBx74+K1za3I+b2E5iQD+x7jxBTEJLuyqjEkSTONKgayr8DUZqnls4yZKohy/btM bOpDqTQbP/+VRe7kFkADHIQwuA7GtpqrzXeiHcfzXaonVLqkPWB6W3PjCvpIer6Mmy5+VoeBC QNR/4wHmGFEVgAIKHJIGY6TK/9c35ecccfV1XuGduM0gHR2rvw+MhAs5FKp3EOLQRaKkkg+4P 2+AuqiyLTyooWZQOdFm9/S3UA4ag2p4TWisLe5nkMJ+3qbW4dV934AiwBs1iwvEhAYAph60XP PgSzzAku95TUxIqIf/lHe5j3s3MaV8LFTebHBBZCxYa/wjkHjJLaeR6nv+m9qrESRrv3EVDvv SOwn5m8vZhJ87VUGIiQu9Rf4yKRhz0bD3tCZvO9vFVLuDCFTGig+d4DQeBS6cS1g0AiwjuqZf abelUHkVmDTdamSK0Z4x2L0l02xqOnwZuG3aLdF45YNQtddVCL82g1nSmLS8aIET4lBc= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In combination with CONFIG_PROFILE_ANNOTATED_BRANCHES=y, the unlikely() inside of the WARN() macro becomes too complex for gcc to see that we don't use the output arguments of mt9m114_to_res() are used correctly: drivers/staging/media/atomisp/i2c/mt9m114.c: In function 'mt9m114_get_fmt': drivers/staging/media/atomisp/i2c/mt9m114.c:817:13: error: 'height' may be used uninitialized in this function [-Werror=maybe-uninitialized] int width, height; ^~~~~~ drivers/staging/media/atomisp/i2c/mt9m114.c: In function 'mt9m114_s_exposure_selection': drivers/staging/media/atomisp/i2c/mt9m114.c:1179:13: error: 'height' may be used uninitialized in this function [-Werror=maybe-uninitialized] Without WARN_ON(), there is no problem, so by simply replacing it with v4l2_err(), the warnings go away. The WARN() output is also not needed here, as we'd probably catch the problem before even getting here, and other checks for the same condition already use v4l2_err. Signed-off-by: Arnd Bergmann --- drivers/staging/media/atomisp/i2c/mt9m114.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c index c4f4c888a59a..12b19fbafb5c 100644 --- a/drivers/staging/media/atomisp/i2c/mt9m114.c +++ b/drivers/staging/media/atomisp/i2c/mt9m114.c @@ -689,12 +689,13 @@ static struct mt9m114_res_struct *mt9m114_to_res(u32 w, u32 h) return &mt9m114_res[index]; } -static int mt9m114_res2size(unsigned int res, int *h_size, int *v_size) +static int mt9m114_res2size(struct v4l2_subdev *sd, int *h_size, int *v_size) { + struct mt9m114_device *dev = to_mt9m114_sensor(sd); unsigned short hsize; unsigned short vsize; - switch (res) { + switch (dev->res) { case MT9M114_RES_736P: hsize = MT9M114_RES_736P_SIZE_H; vsize = MT9M114_RES_736P_SIZE_V; @@ -708,7 +709,8 @@ static int mt9m114_res2size(unsigned int res, int *h_size, int *v_size) vsize = MT9M114_RES_960P_SIZE_V; break; default: - WARN(1, "%s: Resolution 0x%08x unknown\n", __func__, res); + v4l2_err(sd, "%s: Resolution 0x%08x unknown\n", __func__, + dev->res); return -EINVAL; } @@ -820,7 +822,7 @@ static int mt9m114_get_fmt(struct v4l2_subdev *sd, return -EINVAL; fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; - ret = mt9m114_res2size(dev->res, &width, &height); + ret = mt9m114_res2size(sd, &width, &height); if (ret) return ret; fmt->width = width; @@ -1192,7 +1194,7 @@ static int mt9m114_s_exposure_selection(struct v4l2_subdev *sd, grid_right = sel->r.left + sel->r.width - 1; grid_bottom = sel->r.top + sel->r.height - 1; - ret = mt9m114_res2size(dev->res, &width, &height); + ret = mt9m114_res2size(sd, &width, &height); if (ret) return ret;