From patchwork Tue Jul 25 15:39:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9862337 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 0F379600F5 for ; Tue, 25 Jul 2017 15:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0F38286C1 for ; Tue, 25 Jul 2017 15:40:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5D7C286DB; Tue, 25 Jul 2017 15:40:35 +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=unavailable 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 9B2C1286C5 for ; Tue, 25 Jul 2017 15:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752800AbdGYPkV (ORCPT ); Tue, 25 Jul 2017 11:40:21 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50450 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752332AbdGYPkT (ORCPT ); Tue, 25 Jul 2017 11:40:19 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MazN4-1dK1E02pAY-00KP3h; Tue, 25 Jul 2017 17:40:02 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab , Guennadi Liakhovetski , Sakari Ailus Cc: Arnd Bergmann , Hans Verkuil , Robert Jarzmik , Petr Cvek , Pavel Machek , Sebastian Reichel , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: v4l: use WARN_ON(1) instead of __WARN() Date: Tue, 25 Jul 2017 17:39:14 +0200 Message-Id: <20170725154001.294864-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:bWJAwqHlLjS51AOr9JTV8I7FeZEPDY+KI+1iFynKOWd4OIWGjBU IbX/Bw40BT1n2NczWM7+P03jJ5+sZ/n73J07co788i68+BBktVVuCgZyLfLygN4Jz/bzCb1 x+slAjJ6ZwHDATK9XBG9tziZerCC6Gw2Q4FFCLok8iBoEA1C/EutseIyG0lTYAMKNRGe2RR Kgs2ttvgRuvvVjOO6s6cg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6PkKaZQW44I=:RYcURa6FytDsAxmHNr3Sij HzJPdxh09Cp2c63myu48CUBmmQSdTU1qUVafhO7xqNcMU/P0ZQPaIa6YbQDMR5iliQDUWX4Uj XAMUw9PhyRafeBDRJrQCk60M3Ef9ITaZ8jkiMLmxRM5pE5uI4JcAXygBrrktHyVN+e7DUEFRg bGjU1CgTuIxn4vpRr8MTjHjtCFfjkbe6fAuv/dOMOFFcs7G30wmKw7GpNYpd3erOUe1xUXOCY xOJ7xihB1YOSG/izt4BTatXrHjeJFEXL/Zxg1joxCg1OFQOdyGgsnsiz/QWvKy3L+1LHdgv85 CkLFdTGv3cHUZa8Otphsv9k9lqu9uP8Com3iof1GcCgvwcQJHC6TC3OUzIPPA4JbBe7Ph6Dxe UaJG1oM09Zi6Ythm9M5MUc8YlgIWAWZnBCBeBXwSmeADKYf2um4En9QVsxsLQ0QmzloqJdfrA zd5TJ++J6QR+7vYs6qqXqoOzLhSaymkmy1qAbUQh9SKiEaAf8oK64YsIRqDNeddPTkijkHF78 MvzxiWpzB5pfZKz1FEUofFqRQ4srhHcPbKMtW4y3zlB+dyEsJC3MIHP1DDX5SuU9byxK5udcJ pWiN/iiPrPu4mZDRqVi+eOo8lx0qhieSXRlLlJAAZBkqxCFEh80o5awa9cSAPBzyQQZHIF71G oEDv2IpvGz4cs3awZjrAuO716YTD+cSHSqVK8f5z1a8qPsjirm+UCcJXdWEh3X34cmV7fGtwI BQJxoxGfZJ6+ypErec7D+WOJZniMNZD9NuMbWA== 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 __WARN() cannot be used in portable code, since it is only available on some architectures and configurations: drivers/media/platform/pxa_camera.c: In function 'pxa_mbus_config_compatible': drivers/media/platform/pxa_camera.c:642:3: error: implicit declaration of function '__WARN'; did you mean '__WALL'? [-Werror=implicit-function-declaration] The common way to express an unconditional warning is WARN_ON(1), so let's use that here. Fixes: 97bbdf02d905 ("media: v4l: Add support for CSI-1 and CCP2 busses") Signed-off-by: Arnd Bergmann Acked-by: Sakari Ailus Acked-by: Pavel Machek --- drivers/media/platform/pxa_camera.c | 2 +- drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 3898a5cd8664..0d4af6d91ffc 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -639,7 +639,7 @@ static unsigned int pxa_mbus_config_compatible(const struct v4l2_mbus_config *cf V4L2_MBUS_CSI2_CONTINUOUS_CLOCK); return (!mipi_lanes || !mipi_clock) ? 0 : common_flags; default: - __WARN(); + WARN_ON(1); return -EINVAL; } return 0; diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c index 43192d80beef..0ad4b28266e4 100644 --- a/drivers/media/platform/soc_camera/soc_mediabus.c +++ b/drivers/media/platform/soc_camera/soc_mediabus.c @@ -509,7 +509,7 @@ unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg, V4L2_MBUS_CSI2_CONTINUOUS_CLOCK); return (!mipi_lanes || !mipi_clock) ? 0 : common_flags; default: - __WARN(); + WARN_ON(1); return -EINVAL; } return 0;