From patchwork Sat Jan 19 16:33:08 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: 2006901 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 CC1FBDF2A2 for ; Sat, 19 Jan 2013 16:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931Ab3ASQeF (ORCPT ); Sat, 19 Jan 2013 11:34:05 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:44555 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921Ab3ASQeD (ORCPT ); Sat, 19 Jan 2013 11:34:03 -0500 Received: by mail-qc0-f172.google.com with SMTP id b25so1471904qca.17 for ; Sat, 19 Jan 2013 08:34:02 -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=vf9OkQadwAWVXB6zNIANDphL5QW1fI44Kri7lquVYvU=; b=y5+qwl6STNVRcPWzSRyO4p+2mtYMaHNkX02mfxqKBGOabRoguJFvTpcXfba8jdDJI6 gDSGMFAOybdkChvF5Jk+H8gpntrMcuaDdorj1vIa0N8Lbf6ui2BTOGW4/nkTL9Q360+z ew+7B1b0oVWofcGceOqKmJv+T7+Oix7AiOn69wMYZOa+fUxQWMB6hluHvxQMzQQYLNtk 5H6DVQ6d45P+g9SZkJ7giJVtj7BwemJVfY3fpkVjpxV50OecIsMuvA09CxhXFD1XgO0j zRJOyM1fFvwF7DIDrjpDA6kVcMiFHxMsF/jaSVCOc1Kotg9YazHE0ng0REr16PYFvkKM R4CA== X-Received: by 10.49.64.234 with SMTP id r10mr15315843qes.24.1358613242366; Sat, 19 Jan 2013 08:34:02 -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.33.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:01 -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 05/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:08 -0200 Message-Id: <1358613206-4274-5-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_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 --- 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 };