From patchwork Fri Jul 17 14:52:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 36023 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 n6HEu4jb006707 for ; Fri, 17 Jul 2009 14:56:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934442AbZGQO4D (ORCPT ); Fri, 17 Jul 2009 10:56:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934334AbZGQO4D (ORCPT ); Fri, 17 Jul 2009 10:56:03 -0400 Received: from an-out-0708.google.com ([209.85.132.241]:28071 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934027AbZGQO4B (ORCPT ); Fri, 17 Jul 2009 10:56:01 -0400 Received: by an-out-0708.google.com with SMTP id d40so1265254and.1 for ; Fri, 17 Jul 2009 07:56:00 -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 :subject; bh=SGhmqUsImVkyvocIN6IuIO/U9z5xDrkuZrbd47Pm5Nk=; b=ZCODzfc1kxEspwrh5vAA10iqcCzLXd3vYGrAi2RAu5EcmafZDlRFIZdVIOKWkOsJni b+a/V/8SOSiD0wT67vuwehkuFUQ/01COaqOyiksoML4PxSvqWOqbBOO1KRM4oCxnH74L /XiO/TSL0W7Hok/F+piHfaTLLRmehyiCoggnU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=stQK76OnsYDH9WGRYPKcQRi5tdRPUQQzdzwkHHwMHQbLsJV9CJM65oINAJZW76tiy3 4Oq8U3W/liuQPYHwxkfv9cNHqa9idQiv2DTIksOpYcuAlkvKW42a0vr0Q70xeYRklvVp jmw2ACWRZ1r69d5YkYdvJ0DpMyFBXi737D2cM= Received: by 10.100.46.10 with SMTP id t10mr1595679ant.116.1247842560642; Fri, 17 Jul 2009 07:56:00 -0700 (PDT) Received: from rx1.opensource.se ([66.46.77.130]) by mx.google.com with ESMTPS id c29sm409315anc.10.2009.07.17.07.55.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Jul 2009 07:55:59 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org, shimoda.yoshihiro@renesas.com, linux-usb@vger.kernel.org, gregkh@suse.de Date: Fri, 17 Jul 2009 23:52:05 +0900 Message-Id: <20090717145205.17771.85105.sendpatchset@rx1.opensource.se> Subject: [PATCH] usb: convert r8a66597-hcd to dev_pm_ops Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Convert the r8a66597-hcd driver to dev_pm_ops. This makes the driver a good PM citizen and removes a warning printout. Signed-off-by: Magnus Damm --- Tested on a ap325 board with sh7723 cpu using on-chip r8a66597. drivers/usb/host/r8a66597-hcd.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/host/r8a66597-hcd.c +++ work/drivers/usb/host/r8a66597-hcd.c 2009-07-17 23:03:50.000000000 +0900 @@ -2306,9 +2306,9 @@ static struct hc_driver r8a66597_hc_driv }; #if defined(CONFIG_PM) -static int r8a66597_suspend(struct platform_device *pdev, pm_message_t state) +static int r8a66597_suspend(struct device *dev) { - struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev); + struct r8a66597 *r8a66597 = dev_get_drvdata(dev); int port; dbg("%s", __func__); @@ -2324,9 +2324,9 @@ static int r8a66597_suspend(struct platf return 0; } -static int r8a66597_resume(struct platform_device *pdev) +static int r8a66597_resume(struct device *dev) { - struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev); + struct r8a66597 *r8a66597 = dev_get_drvdata(dev); struct usb_hcd *hcd = r8a66597_to_hcd(r8a66597); dbg("%s", __func__); @@ -2336,9 +2336,15 @@ static int r8a66597_resume(struct platfo return 0; } + +static struct dev_pm_ops r8a66597_dev_pm_ops = { + .suspend = r8a66597_suspend, + .resume = r8a66597_resume, +}; + +#define R8A66597_DEV_PM_OPS (&r8a66597_dev_pm_ops) #else /* if defined(CONFIG_PM) */ -#define r8a66597_suspend NULL -#define r8a66597_resume NULL +#define R8A66597_DEV_PM_OPS NULL #endif static int __init_or_module r8a66597_remove(struct platform_device *pdev) @@ -2474,11 +2480,10 @@ clean_up: static struct platform_driver r8a66597_driver = { .probe = r8a66597_probe, .remove = r8a66597_remove, - .suspend = r8a66597_suspend, - .resume = r8a66597_resume, .driver = { .name = (char *) hcd_name, .owner = THIS_MODULE, + .pm = R8A66597_DEV_PM_OPS, }, };