From patchwork Mon Feb 23 18:55:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 8481 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1NJ06Cg028475 for ; Mon, 23 Feb 2009 19:00:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755157AbZBWTAM (ORCPT ); Mon, 23 Feb 2009 14:00:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755177AbZBWTAM (ORCPT ); Mon, 23 Feb 2009 14:00:12 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:43139 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755157AbZBWTAK (ORCPT ); Mon, 23 Feb 2009 14:00:10 -0500 Received: from [91.154.126.168] (port=23095 helo=localhost.localdomain) by serv01.siteground211.com with esmtpa (Exim 4.69) (envelope-from ) id 1Lbfyb-0001at-Oe; Mon, 23 Feb 2009 12:56:26 -0600 From: Felipe Balbi To: linux-omap@vger.kernel.org Cc: Steve Sakoman , Anand Gadiyar , Tony Lindgren Subject: [rft/rfc/patch-v2.6.29-rc5+ 22/23] ehci-omap: Remove defines for clock names Date: Mon, 23 Feb 2009 20:55:34 +0200 Message-Id: <1235415335-17408-23-git-send-email-me@felipebalbi.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235415335-17408-22-git-send-email-me@felipebalbi.com> References: <1235415335-17408-1-git-send-email-me@felipebalbi.com> <1235415335-17408-2-git-send-email-me@felipebalbi.com> <1235415335-17408-3-git-send-email-me@felipebalbi.com> <1235415335-17408-4-git-send-email-me@felipebalbi.com> <1235415335-17408-5-git-send-email-me@felipebalbi.com> <1235415335-17408-6-git-send-email-me@felipebalbi.com> <1235415335-17408-7-git-send-email-me@felipebalbi.com> <1235415335-17408-8-git-send-email-me@felipebalbi.com> <1235415335-17408-9-git-send-email-me@felipebalbi.com> <1235415335-17408-10-git-send-email-me@felipebalbi.com> <1235415335-17408-11-git-send-email-me@felipebalbi.com> <1235415335-17408-12-git-send-email-me@felipebalbi.com> <1235415335-17408-13-git-send-email-me@felipebalbi.com> <1235415335-17408-14-git-send-email-me@felipebalbi.com> <1235415335-17408-15-git-send-email-me@felipebalbi.com> <1235415335-17408-16-git-send-email-me@felipebalbi.com> <1235415335-17408-17-git-send-email-me@felipebalbi.com> <1235415335-17408-18-git-send-email-me@felipebalbi.com> <1235415335-17408-19-git-send-email-me@felipebalbi.com> <1235415335-17408-20-git-send-email-me@felipebalbi.com> <1235415335-17408-21-git-send-email-me@felipebalbi.com> <1235415335-17408-22-git-send-email-me@felipebalbi.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground211.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - felipebalbi.com Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Tony Lindgren This just makes it harder to figure out the clock names when reading the code. If the clock change, they should get set dynamically. Signed-off-by: Tony Lindgren --- drivers/usb/host/ehci-omap.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index e413601..ebfed95 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -163,13 +163,6 @@ struct ehci_hcd_omap { void __iomem *ehci_base; }; -/* Clock names as per clock framework: May change so keep as #defs */ -#define USBHOST_ICKL "usbhost_ick" -#define USBHOST_120M_FCLK "usbhost_120m_fck" -#define USBHOST_48M_FCLK "usbhost_48m_fck" -#define USBHOST_TLL_ICKL "usbtll_ick" -#define USBHOST_TLL_FCLK "usbtll_fck" - /*-------------------------------------------------------------------------*/ static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask) @@ -265,21 +258,21 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd) /* Enable Clocks for USBHOST */ - omap->usbhost_ick = clk_get(omap->dev, USBHOST_ICKL); + omap->usbhost_ick = clk_get(omap->dev, "usbhost_ick"); if (IS_ERR(omap->usbhost_ick)) { ret = PTR_ERR(omap->usbhost_ick); goto err_host_ick; } clk_enable(omap->usbhost_ick); - omap->usbhost2_120m_fck = clk_get(omap->dev, USBHOST_120M_FCLK); + omap->usbhost2_120m_fck = clk_get(omap->dev, "usbhost_120m_fck"); if (IS_ERR(omap->usbhost2_120m_fck)) { ret = PTR_ERR(omap->usbhost2_120m_fck); goto err_host_120m_fck; } clk_enable(omap->usbhost2_120m_fck); - omap->usbhost1_48m_fck = clk_get(omap->dev, USBHOST_48M_FCLK); + omap->usbhost1_48m_fck = clk_get(omap->dev, "usbhost_48m_fck"); if (IS_ERR(omap->usbhost1_48m_fck)) { ret = PTR_ERR(omap->usbhost1_48m_fck); goto err_host_48m_fck; @@ -297,14 +290,14 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd) } /* Configure TLL for 60Mhz clk for ULPI */ - omap->usbtll_fck = clk_get(omap->dev, USBHOST_TLL_FCLK); + omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck"); if (IS_ERR(omap->usbtll_fck)) { ret = PTR_ERR(omap->usbtll_fck); goto err_tll_fck; } clk_enable(omap->usbtll_fck); - omap->usbtll_ick = clk_get(omap->dev, USBHOST_TLL_ICKL); + omap->usbtll_ick = clk_get(omap->dev, "usbtll_ick"); if (IS_ERR(omap->usbtll_ick)) { ret = PTR_ERR(omap->usbtll_ick); goto err_tll_ick;