From patchwork Mon Apr 21 15:56:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 28715 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B78FE2032B for ; Mon, 21 Apr 2014 15:59:50 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf19936769pab.9 for ; Mon, 21 Apr 2014 08:59:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=1XRXoK85+OzACDHqA52E/jivWgU7/wYuOsNeeUCIYFc=; b=SelurGFHE0I6zBUI4jwi9G37uRAv/EbD+ek4G5VFUd6fhqi2nFfatmwuC1ofdtVdkr gBaVAXpEbtMNAqqu1yZSaJonoHfxLkCfF+ZLUfj55NOgAUnJtWuFx46M/XtYjsLvyWtF 3YL/qAqpr3PBUCwl1zW2ZrBcaLpk7yjBFNYo/2Gjr6yZnrTNzbRi0tAGZY4KnhB3uauZ q13tDMlkXKntyiZlweCQT8UXYtw89du7opp33to/qqRnu4ITPPkyj7sRWdjl2ljhLAJC d/Nc3HrLFnVZJKpR7+cKmwMbTXeW3I5RKU2BW3RLdbIYE75zwtujq+5LXzaURp/0wV8Z 0XGg== X-Gm-Message-State: ALoCoQmMtwyzPzFuetipqE0ykN++19E/UNluDLfcgIe1YIyzVgVaRePYmYJqxuozZ5EYRppgLEU6 X-Received: by 10.68.216.230 with SMTP id ot6mr19340696pbc.3.1398095990006; Mon, 21 Apr 2014 08:59:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.177 with SMTP id t46ls2400491qgt.16.gmail; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) X-Received: by 10.58.1.5 with SMTP id 5mr35278676vei.8.1398095989871; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ie18si6316726vec.67.2014.04.21.08.59.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 08:59:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so1194859vcb.11 for ; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) X-Received: by 10.221.34.7 with SMTP id sq7mr31768799vcb.5.1398095989799; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp300557vcb; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) X-Received: by 10.66.191.134 with SMTP id gy6mr38758390pac.27.1398095989034; Mon, 21 Apr 2014 08:59:49 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tm7si8547532pab.439.2014.04.21.08.59.48; Mon, 21 Apr 2014 08:59:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752154AbaDUP7r (ORCPT + 5 others); Mon, 21 Apr 2014 11:59:47 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:43412 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751877AbaDUP70 (ORCPT ); Mon, 21 Apr 2014 11:59:26 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3LFxMWc027209; Mon, 21 Apr 2014 10:59:22 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3LFxME2020766; Mon, 21 Apr 2014 10:59:22 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 21 Apr 2014 10:59:22 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3LFxLtK005375; Mon, 21 Apr 2014 10:59:22 -0500 From: Felipe Balbi To: Linux USB Mailing List CC: Linux OMAP Mailing List , , Tony Lindgren , Felipe Balbi Subject: [PATCH 10/10] usb: phy: generic: switch over to IS_ENABLED() Date: Mon, 21 Apr 2014 10:56:52 -0500 Message-ID: <1398095812-14222-11-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.2.459.g68773ac In-Reply-To: <1398095812-14222-1-git-send-email-balbi@ti.com> References: <1398095812-14222-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , when checking if our generic PHY is enabled, it's a lot easier to use IS_ENABLED() instead of manually checking for it. While at that, also remove the bogus defined(MODULE) at the end of the line. Signed-off-by: Felipe Balbi --- include/linux/usb/usb_phy_generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/usb/usb_phy_generic.h b/include/linux/usb/usb_phy_generic.h index 8346bcc..68adae8 100644 --- a/include/linux/usb/usb_phy_generic.h +++ b/include/linux/usb/usb_phy_generic.h @@ -13,7 +13,7 @@ struct usb_phy_generic_platform_data { int gpio_reset; }; -#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) +#if IS_ENABLED(CONFIG_NOP_USB_XCEIV) /* sometimes transceivers are accessed only through e.g. ULPI */ extern struct platform_device *usb_phy_generic_register(void); extern void usb_phy_generic_unregister(struct platform_device *);