From patchwork Wed Jan 9 12:32:13 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: 1952441 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0AC97DF25A for ; Wed, 9 Jan 2013 12:34:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757627Ab3AIMeg (ORCPT ); Wed, 9 Jan 2013 07:34:36 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:39941 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757427Ab3AIMeg (ORCPT ); Wed, 9 Jan 2013 07:34:36 -0500 Received: by mail-gg0-f174.google.com with SMTP id k2so299314ggd.5 for ; Wed, 09 Jan 2013 04:34:35 -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=1Dfme4JQzO7C+IbI7l1F6rOxGBItmPaUkLN5P2vSC+g=; b=aQMJDaygOvGVHvFeBdsJw5MWYXtVkx/jhYLCe8OGifra+6oQzKO2xfDTOL5IqkWDVX 3HsECiX3SHgPxBWPO0V2G0iCjH+sydNFer1N+kXeK7KlXLor2q5Eu6fspnJgWPW65eii CGBHN+yXU1tS30iDOu4Uq5hQorRbWpt6G52EukMKRqiEKaLveaCL0QPwVQygjssZlaHn uAa0ESiVg1g+kaDntDrG1WIeuU1LGRNGV/oaZHkQD5UwIn5mDRfKqYIpdL5+L4iwX06Y 3UB2pQ5pcG742rIIn5w663A/zqxTWvGan2Vs/3KqJX0Uihs/wr0AXRe1pdaZmOMZ4fTv jMAA== X-Received: by 10.236.87.130 with SMTP id y2mr40629780yhe.37.1357734875516; Wed, 09 Jan 2013 04:34:35 -0800 (PST) Received: from localhost.localdomain ([177.161.160.179]) by mx.google.com with ESMTPS id s65sm68205620yhn.19.2013.01.09.04.34.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Jan 2013 04:34:34 -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 2/3] pci/ttpci/av7110.c: use IS_ENABLED() macro Date: Wed, 9 Jan 2013 10:32:13 -0200 Message-Id: <1357734734-2856-2-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357734734-2856-1-git-send-email-peter.senna@gmail.com> References: <1357734734-2856-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 --- 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) {