From owner-svn-src-projects@FreeBSD.ORG Fri Feb 24 18:58:02 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17B821065676; Fri, 24 Feb 2012 18:58:02 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 030B08FC13; Fri, 24 Feb 2012 18:58:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1OIw1fO079700; Fri, 24 Feb 2012 18:58:01 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1OIw188079698; Fri, 24 Feb 2012 18:58:01 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201202241858.q1OIw188079698@svn.freebsd.org> From: Olivier Houchard Date: Fri, 24 Feb 2012 18:58:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232123 - projects/armv6/sys/arm/ti/usb X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2012 18:58:02 -0000 Author: cognet Date: Fri Feb 24 18:58:01 2012 New Revision: 232123 URL: http://svn.freebsd.org/changeset/base/232123 Log: No need to call ehci_[resume|suspend|shutdown] explicitely anymore, I kept the corresponding omap_* functions instead of just using bus_generic_* so that a brave soul can implement them properly. Modified: projects/armv6/sys/arm/ti/usb/omap_ehci.c Modified: projects/armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- projects/armv6/sys/arm/ti/usb/omap_ehci.c Fri Feb 24 18:57:20 2012 (r232122) +++ projects/armv6/sys/arm/ti/usb/omap_ehci.c Fri Feb 24 18:58:01 2012 (r232123) @@ -667,10 +667,10 @@ omap_ehci_suspend(device_t dev) ehci_softc_t *sc = device_get_softc(dev); int err; + sc = sc; err = bus_generic_suspend(dev); if (err) return (err); - ehci_suspend(sc); return (0); } @@ -691,8 +691,7 @@ static int omap_ehci_resume(device_t dev) { ehci_softc_t *sc = device_get_softc(dev); - - ehci_resume(sc); + sc = sc; bus_generic_resume(dev); @@ -718,10 +717,10 @@ omap_ehci_shutdown(device_t dev) ehci_softc_t *sc = device_get_softc(dev); int err; + sc = sc; err = bus_generic_shutdown(dev); if (err) return (err); - ehci_shutdown(sc); return (0); }