From patchwork Tue Jul 24 09:37:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aaron lu X-Patchwork-Id: 1230921 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A5ED4DF25A for ; Tue, 24 Jul 2012 09:41:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753555Ab2GXJlJ (ORCPT ); Tue, 24 Jul 2012 05:41:09 -0400 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:19934 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753339Ab2GXJjt (ORCPT ); Tue, 24 Jul 2012 05:39:49 -0400 Received: from mail73-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 14.1.225.23; Tue, 24 Jul 2012 09:39:48 +0000 Received: from mail73-va3 (localhost [127.0.0.1]) by mail73-va3-R.bigfish.com (Postfix) with ESMTP id ECE7212014D; Tue, 24 Jul 2012 09:39:47 +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 mail73-va3 (localhost.localdomain [127.0.0.1]) by mail73-va3 (MessageSwitch) id 1343122785650376_1292; Tue, 24 Jul 2012 09:39:45 +0000 (UTC) Received: from VA3EHSMHS015.bigfish.com (unknown [10.7.14.243]) by mail73-va3.bigfish.com (Postfix) with ESMTP id 999E7E0097; Tue, 24 Jul 2012 09:39:45 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by VA3EHSMHS015.bigfish.com (10.7.99.25) with Microsoft SMTP Server id 14.1.225.23; Tue, 24 Jul 2012 09:39:45 +0000 X-WSS-ID: 0M7NS66-02-1NO-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 25F33FCC00B; Tue, 24 Jul 2012 04:39:41 -0500 (CDT) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Tue, 24 Jul 2012 04:39:50 -0500 Received: from sausexmb1.amd.com (163.181.3.156) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server id 8.3.213.0; Tue, 24 Jul 2012 04:39:42 -0500 Received: from storexbh1.amd.com ([10.1.1.17]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 24 Jul 2012 04:39:42 -0500 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 24 Jul 2012 05:39:40 -0400 Received: from srdclcs1.amd.com ([10.237.73.42]) by sshaexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 24 Jul 2012 17:39:30 +0800 From: Aaron Lu To: Jeff Garzik , Alan Stern , Lin Ming , James Bottomley , Jeff Wu CC: , , , , Aaron Lu , Aaron Lu Subject: [PATCH v2 2/7] scsi: pm: use autosuspend if device supports it Date: Tue, 24 Jul 2012 17:37:40 +0800 Message-ID: <1343122665-18711-3-git-send-email-aaron.lu@amd.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1343122665-18711-1-git-send-email-aaron.lu@amd.com> References: <1343122665-18711-1-git-send-email-aaron.lu@amd.com> X-OriginalArrivalTime: 24 Jul 2012 09:39:30.0617 (UTC) FILETIME=[39915A90:01CD6980] MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org If the device is using autosuspend, when scsi_autopm_put_device is called for it, use autosuspend runtime pm calls instead of the sync call. Signed-off-by: Aaron Lu --- drivers/scsi/scsi_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d4201de..a002fbf 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -196,7 +196,12 @@ EXPORT_SYMBOL_GPL(scsi_autopm_get_device); void scsi_autopm_put_device(struct scsi_device *sdev) { - pm_runtime_put_sync(&sdev->sdev_gendev); + if (sdev->sdev_gendev.power.use_autosuspend) { + pm_runtime_mark_last_busy(&sdev->sdev_gendev); + pm_runtime_put_autosuspend(&sdev->sdev_gendev); + } else { + pm_runtime_put_sync(&sdev->sdev_gendev); + } } EXPORT_SYMBOL_GPL(scsi_autopm_put_device);