From patchwork Thu Feb 27 19:49:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 25472 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8A2F420543 for ; Thu, 27 Feb 2014 19:51:37 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id lx4sf10330051iec.6 for ; Thu, 27 Feb 2014 11:51:37 -0800 (PST) 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=HFsyde4k5LRyQqJCJZ1E3N/VMhPm17fnzCc6zrrhgjU=; b=IaObrQ29X+WMsZ36G3DAUk2kN/UsZVLGO2f2PIWlCZNbRs2lKEdFnVt18Y0wxDDMXa GKy68BVzo0i9hSG2SCCqLJwztYq6z9DfsLPPK6yGLFYo5TG2fxoXEYWFM5OwoUt0dkDP +gJ2jyWRKF/DXWsxwA8eraxAF01F5FN/m2h8aVVvKV+vmESQts6TmRn6prGeRDt2zs/1 TVQfRIo+1MnONl1zMIFYtmPM5XgEA2czwd+EEJ+5ndrYJ4pNqX65RUJ+E5Ur8Gm0Dnf2 ZQt9fXhqgOLBv19PyZJaPa7IaSG2/R/8tbEIKb+/61j7FDhqEdjbCxoOjOMPZ9gZjobQ tAfA== X-Gm-Message-State: ALoCoQklRe+7VUY11UQJrXJjGC1J9sctKFiO/mozq6p8Pscihgo9lWNC8LC/Fz5JaLNdottW7TSB X-Received: by 10.182.126.137 with SMTP id my9mr4909482obb.13.1393530697005; Thu, 27 Feb 2014 11:51:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.38 with SMTP id n35ls848155qga.68.gmail; Thu, 27 Feb 2014 11:51:36 -0800 (PST) X-Received: by 10.58.202.4 with SMTP id ke4mr11811568vec.7.1393530696904; Thu, 27 Feb 2014 11:51:36 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id xs6si1563371vec.2.2014.02.27.11.51.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 11:51:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 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.173; Received: by mail-vc0-f173.google.com with SMTP id ld13so2984931vcb.18 for ; Thu, 27 Feb 2014 11:51:36 -0800 (PST) X-Received: by 10.52.27.9 with SMTP id p9mr10289063vdg.28.1393530696763; Thu, 27 Feb 2014 11:51:36 -0800 (PST) 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.130.193 with SMTP id u1csp1515vcs; Thu, 27 Feb 2014 11:51:36 -0800 (PST) X-Received: by 10.68.193.130 with SMTP id ho2mr14815604pbc.141.1393530695694; Thu, 27 Feb 2014 11:51:35 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg2si5685914pbc.143.2014.02.27.11.51.35; Thu, 27 Feb 2014 11:51:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-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 S1753272AbaB0Tvc (ORCPT + 3 others); Thu, 27 Feb 2014 14:51:32 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:37707 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753019AbaB0Tvb (ORCPT ); Thu, 27 Feb 2014 14:51:31 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1RJpU2u009487 for ; Thu, 27 Feb 2014 13:51:30 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RJpUdn013667 for ; Thu, 27 Feb 2014 13:51:30 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 13:51:30 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RJpT6N020713; Thu, 27 Feb 2014 13:51:30 -0600 From: Felipe Balbi To: Linux USB Mailing List CC: Felipe Balbi Subject: [PATCH 7/8] usb: dwc3: core: remove DWC3_PM_OPS Date: Thu, 27 Feb 2014 13:49:56 -0600 Message-ID: <1393530597-12259-7-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393530597-12259-1-git-send-email-balbi@ti.com> References: <1393530597-12259-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@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.173 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: , fix ifdefs around pm callbacks and remove unnecessary DWC3_PM_OPS macro. Signed-off-by: Felipe Balbi --- drivers/usb/dwc3/core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index a49217a..eca1868 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -717,19 +717,17 @@ static int dwc3_resume(struct device *dev) return 0; } +#endif /* CONFIG_PM_SLEEP */ static const struct dev_pm_ops dwc3_dev_pm_ops = { +#ifdef CONFIG_PM_SLEEP .prepare = dwc3_prepare, .complete = dwc3_complete, +#endif /* CONFIG_PM_SLEEP */ SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume) }; -#define DWC3_PM_OPS &(dwc3_dev_pm_ops) -#else -#define DWC3_PM_OPS NULL -#endif - #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { { @@ -749,7 +747,7 @@ static struct platform_driver dwc3_driver = { .driver = { .name = "dwc3", .of_match_table = of_match_ptr(of_dwc3_match), - .pm = DWC3_PM_OPS, + .pm = &dwc3_dev_pm_ops, }, };