From patchwork Tue Feb 2 15:47:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8191531 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7D1439F3CD for ; Tue, 2 Feb 2016 15:49:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9F9120320 for ; Tue, 2 Feb 2016 15:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2543202F2 for ; Tue, 2 Feb 2016 15:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933268AbcBBPsu (ORCPT ); Tue, 2 Feb 2016 10:48:50 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60087 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933093AbcBBPst (ORCPT ); Tue, 2 Feb 2016 10:48:49 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0MCUTZ-1aI8j93P7Z-0097XS; Tue, 02 Feb 2016 16:48:14 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] msp3400: use IS_ENABLED check instead of #if Date: Tue, 2 Feb 2016 16:47:58 +0100 Message-Id: <1454428087-3852112-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:6Yj1aLv0YvHEj4MRWe5R8tu3baRp9zRikiCOc4dLj3QB4hqZfWJ tApS/P7bqU9kLv06HItpusRpDGQ48pTbWZWF/bOgb1p+vm7X/deexlb50G0FMUs2Psdg6tp oaU2hqD1ov918lxgw/JnkHXuieVZcalxci5wFpCVcA411Tuyyo/EcZ/OhgEy74GbocDuXvE OK5hYA+6Y40KdZuIRDuBg== X-UI-Out-Filterresults: notjunk:1; V01:K0:SKuVY8CG59Q=:DZmibGBvlWGi98rYROe+WP 8nlNs39dZBb7pGzUyaf/iep+NaOHLt/40JLOC8kCflC14KfNFk9raubUxsgtE0S01/wYNhQcK rX7/IlDXMRWroO6vTngGg4wnM95qvsWB8XKvOYygFS4znYcP5ifaWEioDpUMEoNTe0eyJ8qJN YhC7zvFQAXfrdboVc1S3cL4+PYo2yRO/KlDKCmNJZAn3Ky/Bp3fYuXm+IzV3k6i06Ae8LQYrs Ze/GxFvTdLRRCLmrJJIBDJ54fK5aDLZh2OhKPfkdBUi6kRZREf1u92h38Ehe0Vga4cqqlB/WL OTfYXreJHIDiL1BVMGfPPfTYjbi4nJCeaGEU8hm0R58dfEulDuUceeltaBvRLIM2llELd/xo1 6r0kAEFiz1Dio8TsAf7GWBSenkblmmTqtmPLb62sYoFM0+7XpVaFhVkZ8bOecdYo4u9UmqWME 6e0lSESWABtlrLO7tkonAaGIFwJhtqPEfoqxeoJHPhcIFAEFuKE2eZqTsavHYWffk0G1Hvc9Q Fr+i4tFANDkq1gk/655LbgmviRC91OC/pZ85IbtPNtPOkwTnG1exQ26lqUmC1jX3ots9SUFvS +FKb5QQK/vYeKQhE7/Zs7nE4dYEf8nk7ugk1apBLCHm7igrcGO1GylbREGXio/S5Hoo2AuGIA nqBPkKiEa2dZjIqvPdM3aMnjn3RVHmIds4OdLFtlOWD+OBbRQvd6q4gSlsqDurE1c3/c= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A recent patch broke the msp3400 driver when CONFIG_MEDIA_CONTROLLER is not set: drivers/media/i2c/msp3400-driver.h:107:5: error: "CONFIG_MEDIA_CONTROLLER" is not defined [-Werror=undef] It was clearly a typo, and this patch changes the "#if CONFIG_MEDIA_CONTROLLER" to a working IS_ENABLED() check. Signed-off-by: Arnd Bergmann Fixes: fb4932821731 ("[media] msp3400: initialize MC data") --- drivers/media/i2c/msp3400-driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/msp3400-driver.h b/drivers/media/i2c/msp3400-driver.h index f0bb37dc9013..a8702aca187a 100644 --- a/drivers/media/i2c/msp3400-driver.h +++ b/drivers/media/i2c/msp3400-driver.h @@ -104,7 +104,7 @@ struct msp_state { unsigned int restart:1; unsigned int watch_stereo:1; -#if CONFIG_MEDIA_CONTROLLER +#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER) struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS]; #endif };