From patchwork Sat Jan 19 23:41:29 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: 2007641 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 3FA4EDF2A2 for ; Sat, 19 Jan 2013 23:43:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752385Ab3ASXnA (ORCPT ); Sat, 19 Jan 2013 18:43:00 -0500 Received: from mail-qa0-f47.google.com ([209.85.216.47]:60272 "EHLO mail-qa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372Ab3ASXm7 (ORCPT ); Sat, 19 Jan 2013 18:42:59 -0500 Received: by mail-qa0-f47.google.com with SMTP id a19so6024300qad.6 for ; Sat, 19 Jan 2013 15:42:58 -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=tbz1Fj/iCR+VH5o7YTOEF7ecM5l2IdWhjlU7TUTkaks=; b=OS1m/bc/asILCAD+E53vFyLlvnAr/1mYBdDjgw8sm40gank9l0o2Sc12aYL5lP5gQ+ 5f9LWRzz7iovwFbnGs/SGOiPUuQsySyhOjTcoZCaqhfsDE1W6U5D/x2+/uvN9eH/iHAB CYDmOvOZiMwfvJkELkkxD3rowCaM+/F+brrG7Y1Zrd3WvLnv1EKv/0l3x9PjW1MId2fH TqgZ9n8xfbBp2RL+OHu+vF5pJOc44xf6fPdAyCWuaNiGNbWB5hX0A+aJz/HNTxQ74+9i Mbt6q769sVG3TQMCYixdaCnemBvmBvKy8dkQHnvrDfutmyNuk809D6uDX8oAw67KtMBY K6Rg== X-Received: by 10.229.102.162 with SMTP id g34mr3369259qco.153.1358638978534; Sat, 19 Jan 2013 15:42:58 -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.42.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:58 -0800 (PST) From: Peter Senna Tschudin To: mchehab@redhat.com Cc: jarod@redhat.com, tralph@mythtv.org, peter.senna@gmail.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH V2 22/24] usb/hdpvr/hdpvr-core.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:29 -0200 Message-Id: <1358638891-4775-23-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_I2C) || \ defined(CONFIG_I2C_MODULE) with: #if IS_ENABLED(CONFIG_I2C) This change was made for: CONFIG_I2C Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- Changes from V1: Updated subject drivers/media/usb/hdpvr/hdpvr-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c index 84dc26f..5c61935 100644 --- a/drivers/media/usb/hdpvr/hdpvr-core.c +++ b/drivers/media/usb/hdpvr/hdpvr-core.c @@ -391,7 +391,7 @@ static int hdpvr_probe(struct usb_interface *interface, goto error; } -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) retval = hdpvr_register_i2c_adapter(dev); if (retval < 0) { v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n"); @@ -419,7 +419,7 @@ static int hdpvr_probe(struct usb_interface *interface, return 0; reg_fail: -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) i2c_del_adapter(&dev->i2c_adapter); #endif error: @@ -451,7 +451,7 @@ static void hdpvr_disconnect(struct usb_interface *interface) mutex_lock(&dev->io_mutex); hdpvr_cancel_queue(dev); mutex_unlock(&dev->io_mutex); -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) i2c_del_adapter(&dev->i2c_adapter); #endif video_unregister_device(dev->video_dev);