From patchwork Sat Jan 19 16:33:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 2007071 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AC1D93FE1F for ; Sat, 19 Jan 2013 16:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059Ab3ASQfE (ORCPT ); Sat, 19 Jan 2013 11:35:04 -0500 Received: from mail-qa0-f48.google.com ([209.85.216.48]:56593 "EHLO mail-qa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751939Ab3ASQfC (ORCPT ); Sat, 19 Jan 2013 11:35:02 -0500 Received: by mail-qa0-f48.google.com with SMTP id l8so3733666qaq.7 for ; Sat, 19 Jan 2013 08:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=D3Y/8DqP2eKU1G1N8+GcaYlQah4rCqxsW6RuUnXDGxY=; b=xPXWQPaQbHMVOBMEYPg1S0R68mhKTiqIR0GFxXWMjp/dxKvkrdTUnzvEiCEs5RFJB+ pwaIQtVyguTIEftFO0yaiJh0fa1fwB224dJv39iuFF7YcXlHPD3l/U7XNuUNMRNZLVM9 fZ0PNuFCIJlrsH4QgNhxc8Gvrjdt30QRwyqnKew9QV98weuCRlhv2fCeu/pwvPJRxs4Q RiD8KNNxr1WzcTt6iwiGr7+Cn0tvsgXcL/7fBBAYKtZ2ZnmSiZvJljVYVMKXPUCnyjHw 8qYge6tvfHKWDlTKxUYYNS01GO2VGSHqnaNOzjenG/HQRV9EohMOd9hqrPF+o2Mhjtd5 RWOg== X-Received: by 10.229.137.131 with SMTP id w3mr3234137qct.40.1358613301617; Sat, 19 Jan 2013 08:35:01 -0800 (PST) Received: from ace.home.cabure.org (200-140-13-6.bsace705.dsl.brasiltelecom.net.br. [200.140.13.6]) by mx.google.com with ESMTPS id f7sm5410451qap.13.2013.01.19.08.34.58 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:35:01 -0800 (PST) From: Peter Senna Tschudin To: mchehab@redhat.com Cc: hans.verkuil@cisco.com, sakari.ailus@iki.fi, dhowells@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 24/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:26 -0200 Message-Id: <1358613206-4274-23-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> References: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org replace: #if defined(CONFIG_MEDIA_TUNER_TEA5761) || \ defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) with: #if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761) This change was made for: CONFIG_MEDIA_TUNER_TEA5761 Also replaced: with: Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- drivers/media/v4l2-core/v4l2-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 614316f..aa044f4 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -238,7 +238,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match) } EXPORT_SYMBOL(v4l2_chip_match_host); -#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) +#if IS_ENABLED(CONFIG_I2C) int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match) { int len; @@ -384,7 +384,7 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr); const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type) { static const unsigned short radio_addrs[] = { -#if defined(CONFIG_MEDIA_TUNER_TEA5761) || defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) +#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761) 0x10, #endif 0x60,