From patchwork Sat Jan 19 23:41:12 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: 2007481 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 791F1DF2A2 for ; Sat, 19 Jan 2013 23:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040Ab3ASXmO (ORCPT ); Sat, 19 Jan 2013 18:42:14 -0500 Received: from mail-qc0-f171.google.com ([209.85.216.171]:61462 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab3ASXmN (ORCPT ); Sat, 19 Jan 2013 18:42:13 -0500 Received: by mail-qc0-f171.google.com with SMTP id d1so907198qca.2 for ; Sat, 19 Jan 2013 15:42:12 -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=sGMAQpMP+S/ob32L54r/1+GnJc4Qjd45hALC6O6uT5A=; b=FDp94YyzxA8d88sHfBmcyg3zTneOpcrzesVRAIO2kiqPmhu0CmbGXXE8olS1EyCmq2 G9goJYqvZiZbpp7pF96lXKPUfi/wvCObmfENnIGZwECOJp1mmlw4CHW26cRJOE0Fw6mD vTvEisGG1oO5nWghQu8UgRF4q+XVGa+++C8+f7mWdFUA5QTV/8anIIK713Y21VcoFKwl TmisQ1GVcja9b+/vn7bEVKcxgsiGs9Cimx5oqnJJbwcBo7ZPW6uVkRQ3O0xThvWeV6oP ee8+fy9d7MlGfwaIahMdhjIsuqXGGGHw2F3AfPR/wEyV1QGaA0Wd9DcfHz2FstX6XOuM CyHQ== X-Received: by 10.229.136.139 with SMTP id r11mr3462122qct.3.1358638932328; Sat, 19 Jan 2013 15:42:12 -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.02 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:11 -0800 (PST) From: Peter Senna Tschudin To: hverkuil@xs4all.nl Cc: mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH V2 05/24] radio/si470x/radio-si470x.h: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:12 -0200 Message-Id: <1358638891-4775-6-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_USB_SI470X) || \ defined(CONFIG_USB_SI470X_MODULE) with: #if IS_ENABLED(CONFIG_USB_SI470X) This change was made for: CONFIG_USB_SI470X, CONFIG_I2C_SI470X Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin Acked-by: Hans Verkuil --- Changes from V1: Updated subject drivers/media/radio/si470x/radio-si470x.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h index 2f089b4..467e955 100644 --- a/drivers/media/radio/si470x/radio-si470x.h +++ b/drivers/media/radio/si470x/radio-si470x.h @@ -163,7 +163,7 @@ struct si470x_device { struct completion completion; bool status_rssi_auto_update; /* Does RSSI get updated automatic? */ -#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) +#if IS_ENABLED(CONFIG_USB_SI470X) /* reference to USB and video device */ struct usb_device *usbdev; struct usb_interface *intf; @@ -179,7 +179,7 @@ struct si470x_device { unsigned char hardware_version; #endif -#if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE) +#if IS_ENABLED(CONFIG_I2C_SI470X) struct i2c_client *client; #endif };