From patchwork Mon Feb 23 18:52:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 8450 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 n1NIrEbn027763 for ; Mon, 23 Feb 2009 18:53:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbZBWSxa (ORCPT ); Mon, 23 Feb 2009 13:53:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754513AbZBWSxa (ORCPT ); Mon, 23 Feb 2009 13:53:30 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:46660 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754501AbZBWSx3 (ORCPT ); Mon, 23 Feb 2009 13:53:29 -0500 Received: from [91.154.126.168] (port=23085 helo=localhost.localdomain) by serv01.siteground211.com with esmtpa (Exim 4.69) (envelope-from ) id 1Lbfvh-0008HW-Mo; Mon, 23 Feb 2009 12:53:26 -0600 From: Felipe Balbi To: linux-omap@vger.kernel.org Cc: Steve Sakoman , Anand Gadiyar , Syed Mohammed Khasim , Felipe Balbi Subject: [rft/rfc/patch-v2.6.29-rc5+ 07/23] usb: host: ehci: get rid of pm functions Date: Mon, 23 Feb 2009 20:52:35 +0200 Message-Id: <1235415171-17376-8-git-send-email-me@felipebalbi.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235415171-17376-7-git-send-email-me@felipebalbi.com> References: <1235415171-17376-1-git-send-email-me@felipebalbi.com> <1235415171-17376-2-git-send-email-me@felipebalbi.com> <1235415171-17376-3-git-send-email-me@felipebalbi.com> <1235415171-17376-4-git-send-email-me@felipebalbi.com> <1235415171-17376-5-git-send-email-me@felipebalbi.com> <1235415171-17376-6-git-send-email-me@felipebalbi.com> <1235415171-17376-7-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 That was just a useless function call, completely unneeded. Remove it. Signed-off-by: Felipe Balbi --- drivers/usb/host/ehci-omap.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index db4576d..1b387cc 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -511,20 +511,6 @@ static int ehci_hcd_omap_drv_remove(struct platform_device *pdev) return 0; } -/*-------------------------------------------------------------------------*/ -#ifdef CONFIG_PM -static int omap_ehci_bus_suspend(struct usb_hcd *hcd) -{ - return ehci_bus_suspend(hcd); -} - -static int omap_ehci_bus_resume(struct usb_hcd *hcd) -{ - return ehci_bus_resume(hcd); -} -#endif -/*-------------------------------------------------------------------------*/ - static const struct hc_driver ehci_omap_hc_driver = { .description = hcd_name, .product_desc = "OMAP-EHCI Host Controller", @@ -562,10 +548,8 @@ static const struct hc_driver ehci_omap_hc_driver = { */ .hub_status_data = ehci_hub_status_data, .hub_control = ehci_hub_control, -#ifdef CONFIG_PM - .bus_suspend = omap_ehci_bus_suspend, - .bus_resume = omap_ehci_bus_resume, -#endif + .bus_suspend = ehci_bus_suspend, + .bus_resume = ehci_bus_resume, }; MODULE_ALIAS("platform:omap-ehci");