From patchwork Fri Jul 27 09:00:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 173599 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D80B52C008A for ; Fri, 27 Jul 2012 19:05:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752418Ab2G0JCm (ORCPT ); Fri, 27 Jul 2012 05:02:42 -0400 Received: from ch1ehsobe005.messaging.microsoft.com ([216.32.181.185]:27491 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752181Ab2G0JCO (ORCPT ); Fri, 27 Jul 2012 05:02:14 -0400 Received: from mail202-ch1-R.bigfish.com (10.43.68.254) by CH1EHSOBE011.bigfish.com (10.43.70.61) with Microsoft SMTP Server id 14.1.225.23; Fri, 27 Jul 2012 09:02:12 +0000 Received: from mail202-ch1 (localhost [127.0.0.1]) by mail202-ch1-R.bigfish.com (Postfix) with ESMTP id E0EEB1E0160; Fri, 27 Jul 2012 09:02:12 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.109; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2dh668h839hd24he5bhf0ah107ah) Received: from mail202-ch1 (localhost.localdomain [127.0.0.1]) by mail202-ch1 (MessageSwitch) id 1343379730197625_5193; Fri, 27 Jul 2012 09:02:10 +0000 (UTC) Received: from CH1EHSMHS001.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.250]) by mail202-ch1.bigfish.com (Postfix) with ESMTP id 227B68021F; Fri, 27 Jul 2012 09:02:10 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by CH1EHSMHS001.bigfish.com (10.43.70.1) with Microsoft SMTP Server id 14.1.225.23; Fri, 27 Jul 2012 09:02:08 +0000 X-WSS-ID: 0M7TAFH-02-6O7-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1) with ESMTP id 2746FC80D2; Fri, 27 Jul 2012 04:02:04 -0500 (CDT) Received: from sausexhtp01.amd.com (163.181.3.165) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Fri, 27 Jul 2012 04:02:24 -0500 Received: from sausexmb1.amd.com (163.181.3.156) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server id 8.3.213.0; Fri, 27 Jul 2012 04:02:05 -0500 Received: from storexbh1.amd.com ([10.1.1.17]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Jul 2012 04:02:05 -0500 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Jul 2012 05:02:03 -0400 Received: from aarontestpc.amd.com ([10.237.73.134]) by sshaexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Jul 2012 17:01:59 +0800 From: Aaron Lu To: James Bottomley , Jeff Garzik , Alan Stern , Sergei Shtylyov , Oliver Neukum CC: Jeff Wu , Lin Ming , , , , , Aaron Lu , Aaron Lu Subject: [PATCH v4 5/7] scsi: pm: use runtime resume callback if available Date: Fri, 27 Jul 2012 17:00:48 +0800 Message-ID: <1343379650-2867-6-git-send-email-aaron.lu@amd.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1343379650-2867-1-git-send-email-aaron.lu@amd.com> References: <1343379650-2867-1-git-send-email-aaron.lu@amd.com> X-OriginalArrivalTime: 27 Jul 2012 09:01:59.0361 (UTC) FILETIME=[7AF43310:01CD6BD6] MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org When runtime resume a scsi device, if the device's driver has implemented runtime resume callback, use that. sr driver needs this to do different things for system resume and runtime resume. Signed-off-by: Aaron Lu --- drivers/scsi/scsi_pm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index 83edb93..690136c 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -34,14 +34,19 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg) return err; } -static int scsi_dev_type_resume(struct device *dev) +static int scsi_dev_type_resume(struct device *dev, bool runtime) { struct device_driver *drv; int err = 0; + int (*resume)(struct device *); drv = dev->driver; - if (drv && drv->resume) - err = drv->resume(dev); + if (runtime && drv && drv->pm && drv->pm->runtime_resume) + resume = drv->pm->runtime_resume; + else + resume = drv ? drv->resume : NULL; + if (resume) + err = resume(dev); scsi_device_resume(to_scsi_device(dev)); dev_dbg(dev, "scsi resume: %d\n", err); return err; @@ -85,7 +90,7 @@ static int scsi_bus_resume_common(struct device *dev) pm_runtime_get_sync(dev->parent); if (scsi_is_sdev_device(dev)) - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, false); if (err == 0) { pm_runtime_disable(dev); pm_runtime_set_active(dev); @@ -160,7 +165,7 @@ static int scsi_runtime_resume(struct device *dev) dev_dbg(dev, "scsi_runtime_resume\n"); if (scsi_is_sdev_device(dev)) - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, true); /* Insert hooks here for targets, hosts, and transport classes */