From patchwork Sat Nov 15 19:50:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5312141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 281829F440 for ; Sat, 15 Nov 2014 19:53:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35FF82017D for ; Sat, 15 Nov 2014 19:53:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6896720149 for ; Sat, 15 Nov 2014 19:53:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XpjNC-0006Vp-SP; Sat, 15 Nov 2014 19:51:06 +0000 Received: from mail-wg0-x231.google.com ([2a00:1450:400c:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XpjNA-0006Uo-Ly for linux-arm-kernel@lists.infradead.org; Sat, 15 Nov 2014 19:51:05 +0000 Received: by mail-wg0-f49.google.com with SMTP id x13so21722760wgg.22 for ; Sat, 15 Nov 2014 11:50:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=6n2dy6HUUkagqsL8ov3Qm/CfTA+IF3+TFxDqRY4oe2Q=; b=o/SW129deBCu+L2GoUxt9yraZEsgu6vl6Xnci8iAQM8gMum4KVU4hLcAXOb/7mFHOS 68PEJPj+A0WvwzVJXLAF9fs8QW9dFs/cJnFRnuPIS0TUMfKRBxn8MFNT3uU8cqGlzood kj2MkRQwyoY9yjQvQ5qeOB1F49crALFVHm8uFrHYclJvfdCGqOvP2hA12ACh7QZn9vss fopEjp2kCCO27U97LUFLrvYPvcZLmjgu33JHl+j7pKhUkT+rUSfFdJ91EmqxedutE74L Hu5ET+JiAUj7ay+KT3aZiFqntvcxrbwnhXY/qnJpt6YfoC/iCvRhaJ1QjwkI4s6Mx9xu jNAQ== X-Received: by 10.194.95.100 with SMTP id dj4mr24635020wjb.48.1416081042706; Sat, 15 Nov 2014 11:50:42 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id dr5sm8199004wib.4.2014.11.15.11.50.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Nov 2014 11:50:41 -0800 (PST) From: Dmitry Eremin-Solenikov To: Felipe Balbi , Robert Jarzmik , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang Subject: [PATCH 1/2] usb: gadget: pxa25x_udc: prepare/unprepare clocks in pxa-ssp Date: Sat, 15 Nov 2014 22:50:29 +0300 Message-Id: <1416081030-28260-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141115_115104_944395_4746E421 X-CRM114-Status: GOOD ( 10.78 ) X-Spam-Score: -0.8 (/) Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre(). Signed-off-by: Dmitry Eremin-Solenikov --- drivers/usb/gadget/udc/pxa25x_udc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c index 42f7eeb..e4964ee 100644 --- a/drivers/usb/gadget/udc/pxa25x_udc.c +++ b/drivers/usb/gadget/udc/pxa25x_udc.c @@ -103,8 +103,8 @@ static const char ep0name [] = "ep0"; /* IXP doesn't yet support */ #define clk_get(dev,name) NULL -#define clk_enable(clk) do { } while (0) -#define clk_disable(clk) do { } while (0) +#define clk_prepare_enable(clk) do { } while (0) +#define clk_disable_unprepare(clk) do { } while (0) #define clk_put(clk) do { } while (0) #endif @@ -932,7 +932,7 @@ static int pullup(struct pxa25x_udc *udc) if (!udc->active) { udc->active = 1; /* Enable clock for USB device */ - clk_enable(udc->clk); + clk_prepare_enable(udc->clk); udc_enable(udc); } } else { @@ -945,7 +945,7 @@ static int pullup(struct pxa25x_udc *udc) } udc_disable(udc); /* Disable clock for USB device */ - clk_disable(udc->clk); + clk_disable_unprepare(udc->clk); udc->active = 0; }