From patchwork Fri Jun 5 07:55:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 28087 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 n557xHAM024897 for ; Fri, 5 Jun 2009 07:59:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753962AbZFEH6v (ORCPT ); Fri, 5 Jun 2009 03:58:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753731AbZFEH6v (ORCPT ); Fri, 5 Jun 2009 03:58:51 -0400 Received: from rv-out-0506.google.com ([209.85.198.239]:33932 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbZFEH6u (ORCPT ); Fri, 5 Jun 2009 03:58:50 -0400 Received: by rv-out-0506.google.com with SMTP id f9so604462rvb.1 for ; Fri, 05 Jun 2009 00:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=gdtc03vHMlsoNyRUwDvVfja0bsvH4rl/jhydHYo4Ans=; b=cuQYLm6ll35KTD4jajhF1j9KFkqPGa+oTOlZ8Udl64b6WBkts8kPgXQ/IjFtAMDyoL e63AScw132+Shu64acyTBymyNgc+hOG+8yNUAt2G7npzd5yqB9HdehFhLgwdE52hjEUa GvoojsN2LXquF3i56CtGrflKbWG+nXU0fwdpQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=WatY+HIRVX/0GiIuAdeYE/NxYgO35RmZiu+1iPXGJR407GDsL/daFGaQdchfx5ASCG +AOrC/XkG+OpWWOZeuPo2TxCdB/eWl/p6KVFvJsRr07iF6wGkIU1Brkq3wWbK/phfh9U /nY7M6f9FXJmL54XK0JKwbp2CJbOgOPgIZfKc= Received: by 10.141.105.14 with SMTP id h14mr2780545rvm.266.1244188733412; Fri, 05 Jun 2009 00:58:53 -0700 (PDT) Received: from rx1.opensource.se (mailhost.igel.co.jp [219.106.231.130]) by mx.google.com with ESMTPS id k37sm30858246rvb.18.2009.06.05.00.58.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 05 Jun 2009 00:58:52 -0700 (PDT) From: Magnus Damm To: linux-pm@lists.linux-foundation.org Cc: pavel@ucw.cz, hskinnemoen@atmel.com, anemo@mba.ocn.ne.jp, gregkh@suse.de, rjw@sisk.pl, stern@rowland.harvard.edu, ben-linux@fluff.org, felipe.balbi@nokia.com, linux-omap@vger.kernel.org, Magnus Damm Date: Fri, 05 Jun 2009 16:55:33 +0900 Message-Id: <20090605075533.14756.69837.sendpatchset@rx1.opensource.se> In-Reply-To: <20090605075436.14756.80501.sendpatchset@rx1.opensource.se> References: <20090605075436.14756.80501.sendpatchset@rx1.opensource.se> Subject: [PATCH 06/07] usb: rework musb suspend()/resume_early() Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Magnus Damm This patch reworks platform driver power management code for musb from legacy callbacks to dev_pm_ops. The callbacks are converted for CONFIG_SUSPEND like this: suspend() -> suspend() resume_early() -> resume_noirq() Signed-off-by: Magnus Damm --- Untested but compiles fine. drivers/i2c/busses/i2c-pxa.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/usb/musb/musb_core.c +++ work/drivers/usb/musb/musb_core.c 2009-06-01 15:27:12.000000000 +0900 @@ -2168,8 +2168,9 @@ static int __devexit musb_remove(struct #ifdef CONFIG_PM -static int musb_suspend(struct platform_device *pdev, pm_message_t message) +static int musb_suspend(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); unsigned long flags; struct musb *musb = dev_to_musb(&pdev->dev); @@ -2196,8 +2197,9 @@ static int musb_suspend(struct platform_ return 0; } -static int musb_resume_early(struct platform_device *pdev) +static int musb_resume_noirq(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); struct musb *musb = dev_to_musb(&pdev->dev); if (!musb->clock) @@ -2215,9 +2217,14 @@ static int musb_resume_early(struct plat return 0; } +static struct dev_pm_ops musb_dev_pm_ops = { + .suspend = musb_suspend, + .resume_noirq = musb_resume_noirq, +}; + +#define MUSB_DEV_PM_OPS (&musb_dev_pm_ops) #else -#define musb_suspend NULL -#define musb_resume_early NULL +#define MUSB_DEV_PM_OPS NULL #endif static struct platform_driver musb_driver = { @@ -2225,11 +2232,10 @@ static struct platform_driver musb_drive .name = (char *)musb_driver_name, .bus = &platform_bus_type, .owner = THIS_MODULE, + .pm = MUSB_DEV_PM_OPS, }, .remove = __devexit_p(musb_remove), .shutdown = musb_shutdown, - .suspend = musb_suspend, - .resume_early = musb_resume_early, }; /*-------------------------------------------------------------------------*/