From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Lu Subject: [PATCH v4 3/5] Revert "[SCSI] runtime resume parent for child's system-resume" Date: Fri, 9 Nov 2012 15:27:53 +0800 Message-ID: <1352446075-1814-4-git-send-email-aaron.lu@intel.com> References: <1352446075-1814-1-git-send-email-aaron.lu@intel.com> Return-path: In-Reply-To: <1352446075-1814-1-git-send-email-aaron.lu@intel.com> Sender: linux-scsi-owner@vger.kernel.org To: James Bottomley Cc: Alan Stern , "Rafael J. Wysocki" , linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org, Aaron Lu , Aaron Lu List-Id: linux-pm@vger.kernel.org This reverts commit 28fd00d42cca178638f51c08efa986a777c24a4b. With commit 88d26136a256576e444db312179e17af6dd0ea87 (PM: Prevent runtime suspend during system resume), this patch is no longer needed. Signed-off-by: Aaron Lu Acked-by: Alan Stern Acked-by: Rafael J. Wysocki --- drivers/scsi/scsi_pm.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d4201de..9923b26 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -76,17 +76,8 @@ static int scsi_bus_resume_common(struct device *dev) { int err = 0; - if (scsi_is_sdev_device(dev)) { - /* - * Parent device may have runtime suspended as soon as - * it is woken up during the system resume. - * - * Resume it on behalf of child. - */ - pm_runtime_get_sync(dev->parent); + if (scsi_is_sdev_device(dev)) err = scsi_dev_type_resume(dev); - pm_runtime_put_sync(dev->parent); - } if (err == 0) { pm_runtime_disable(dev); -- 1.7.12.21.g871e293