From patchwork Sat Jan 19 23:41:10 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: 2007461 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 6A2AD3FE1F for ; Sat, 19 Jan 2013 23:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751860Ab3ASXmD (ORCPT ); Sat, 19 Jan 2013 18:42:03 -0500 Received: from mail-qa0-f43.google.com ([209.85.216.43]:63667 "EHLO mail-qa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809Ab3ASXmA (ORCPT ); Sat, 19 Jan 2013 18:42:00 -0500 Received: by mail-qa0-f43.google.com with SMTP id cr7so6051840qab.2 for ; Sat, 19 Jan 2013 15:42:00 -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=D8FkVLEq9T43ubUlG9fSvU+9c9osMu3qAqIzznNJsfY=; b=qz/ULPlFhGT5zs0KxyLGjIdn6AJNAD5hOJboJvErLJRG+OGz7dhNGi+nnvkvu5nnWZ wEfnvZq6aFum83vBxUuKbWkaLPmyGDp/e0XMPa4VPs8GprRVKrSKA3mGCgHfYGE6Hp/p Fb+jGKMirQXkkz+E/aG9WgT5/x2kho++oWdpnMrEIfXGpVXyRK2qET7bQmxvBT7gLBuA 3aQ6LhQgmdSFYm1MdvqHOlkYMHE8ZGFYROl5RVSpxP86G63r8jOBAmm7ij+KGmaEEUaw 23Cyz2Rgrk8B1rfUkKHL2UYOn1VCkju852OKXkDpwaeCQXRaj4QrEZc9Fnq1rlQOlM4/ ef1g== X-Received: by 10.224.180.69 with SMTP id bt5mr14629864qab.36.1358638919905; Sat, 19 Jan 2013 15:41:59 -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 y1sm6058595qan.22.2013.01.19.15.41.57 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:41:59 -0800 (PST) From: Peter Senna Tschudin To: mchehab@redhat.com Cc: schulz@macnetix.de, dhowells@redhat.com, peter.senna@gmail.com, mkrufky@linuxtv.org, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH V2 03/24] pci/ttpci/av7110.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:10 -0200 Message-Id: <1358638891-4775-4-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358638891-4775-1-git-send-email-peter.senna@gmail.com> References: <1358638891-4775-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_INPUT_EVDEV) || \ defined(CONFIG_INPUT_EVDEV_MODULE) with: #if IS_ENABLED(CONFIG_INPUT_EVDEV) This change was made for: CONFIG_INPUT_EVDEV, CONFIG_DVB_SP8870 Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- Changes from V1: Updated subject drivers/media/pci/ttpci/av7110.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index 2f54e2b..fc9e7e5 100644 --- a/drivers/media/pci/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c @@ -235,7 +235,7 @@ static void recover_arm(struct av7110 *av7110) restart_feeds(av7110); -#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) +#if IS_ENABLED(CONFIG_INPUT_EVDEV) av7110_check_ir_config(av7110, true); #endif } @@ -268,7 +268,7 @@ static int arm_thread(void *data) if (!av7110->arm_ready) continue; -#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) +#if IS_ENABLED(CONFIG_INPUT_EVDEV) av7110_check_ir_config(av7110, false); #endif @@ -1730,7 +1730,7 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name) { -#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE) +#if IS_ENABLED(CONFIG_DVB_SP8870) struct av7110* av7110 = fe->dvb->priv; return request_firmware(fw, name, &av7110->dev->pci->dev); @@ -2725,7 +2725,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, mutex_init(&av7110->ioctl_mutex); -#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) +#if IS_ENABLED(CONFIG_INPUT_EVDEV) av7110_ir_init(av7110); #endif printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); @@ -2768,7 +2768,7 @@ static int __devexit av7110_detach(struct saa7146_dev* saa) struct av7110 *av7110 = saa->ext_priv; dprintk(4, "%p\n", av7110); -#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) +#if IS_ENABLED(CONFIG_INPUT_EVDEV) av7110_ir_exit(av7110); #endif if (budgetpatch || av7110->full_ts) {