From patchwork Sat Jan 23 23:41:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 74958 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0NNgWCj016730 for ; Sat, 23 Jan 2010 23:42:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753212Ab0AWXmX (ORCPT ); Sat, 23 Jan 2010 18:42:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753143Ab0AWXmK (ORCPT ); Sat, 23 Jan 2010 18:42:10 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:43519 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100Ab0AWXmC (ORCPT ); Sat, 23 Jan 2010 18:42:02 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 098AA174DC9; Sun, 24 Jan 2010 00:30:52 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04894-01; Sun, 24 Jan 2010 00:30:34 +0100 (CET) Received: from tosh.localnet (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 9F418174DD4; Sun, 24 Jan 2010 00:30:18 +0100 (CET) From: "Rafael J. Wysocki" To: LKML Subject: [PATCH 8/8] PM: Allow SCSI devices to suspend/resume asynchronously Date: Sun, 24 Jan 2010 00:41:30 +0100 User-Agent: KMail/1.12.3 (Linux/2.6.33-rc4-rjw; KDE/4.3.3; x86_64; ; ) Cc: Alan Stern , Linus Torvalds , Linux PCI , pm list , linux-usb@vger.kernel.org, Greg KH , Jesse Barnes , James Bottomley , Linux SCSI , Arjan van de Ven , ACPI Devel Maling List , Len Brown , Nigel Cunningham References: <201001240033.34253.rjw@sisk.pl> In-Reply-To: <201001240033.34253.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201001240041.30899.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Index: linux-2.6/drivers/scsi/hosts.c =================================================================== --- linux-2.6.orig/drivers/scsi/hosts.c +++ linux-2.6/drivers/scsi/hosts.c @@ -215,6 +215,8 @@ int scsi_add_host_with_dma(struct Scsi_H shost->shost_gendev.parent = dev ? dev : &platform_bus; shost->dma_dev = dma_dev; + device_enable_async_suspend(&shost->shost_gendev); + error = device_add(&shost->shost_gendev); if (error) goto out; @@ -222,6 +224,8 @@ int scsi_add_host_with_dma(struct Scsi_H scsi_host_set_state(shost, SHOST_RUNNING); get_device(shost->shost_gendev.parent); + device_enable_async_suspend(&shost->shost_dev); + error = device_add(&shost->shost_dev); if (error) goto out_del_gendev; Index: linux-2.6/drivers/scsi/scsi_sysfs.c =================================================================== --- linux-2.6.orig/drivers/scsi/scsi_sysfs.c +++ linux-2.6/drivers/scsi/scsi_sysfs.c @@ -847,6 +847,8 @@ static int scsi_target_add(struct scsi_t if (starget->state != STARGET_CREATED) return 0; + device_enable_async_suspend(&starget->dev); + error = device_add(&starget->dev); if (error) { dev_err(&starget->dev, "target device_add failed, error %d\n", error); @@ -886,11 +888,13 @@ int scsi_sysfs_add_sdev(struct scsi_devi return error; transport_configure_device(&starget->dev); + device_enable_async_suspend(&sdev->sdev_gendev); error = device_add(&sdev->sdev_gendev); if (error) { printk(KERN_INFO "error 1\n"); goto out_remove; } + device_enable_async_suspend(&sdev->sdev_dev); error = device_add(&sdev->sdev_dev); if (error) { printk(KERN_INFO "error 2\n");