diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-08 13:18:26 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-26 14:39:12 -0500 |
commit | 4cb077d93a57fb8bb64c277ec4ce637823cd76f4 (patch) | |
tree | 2035b21282c5746c869065cf917ef06c1c4c7848 /drivers/scsi/scsi_sysfs.c | |
parent | 927bc9165d3cd01054b472f9b25d91a8707209c8 (diff) |
PM: Allow SCSI devices to suspend/resume asynchronously
Set power.async_suspend for all SCSI devices, targets and hosts, so
that they can be suspended and resumed in parallel with the main
suspend/resume thread and possibly with other devices they don't
depend on in a known way (i.e. devices which are not their parents or
children).
The power.async_suspend flag is also set for devices that don't have
suspend or resume callbacks, because otherwise they would make the
main suspend/resume thread wait for their "asynchronous" children
(during suspend) or parents (during resume), effectively negating the
possible gains from executing these devices' suspend and resume
callbacks asynchronously.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
-rw-r--r-- | drivers/scsi/scsi_sysfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 5a065055e68a..c5580805a359 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -847,6 +847,8 @@ static int scsi_target_add(struct scsi_target *starget) | |||
847 | if (starget->state != STARGET_CREATED) | 847 | if (starget->state != STARGET_CREATED) |
848 | return 0; | 848 | return 0; |
849 | 849 | ||
850 | device_enable_async_suspend(&starget->dev); | ||
851 | |||
850 | error = device_add(&starget->dev); | 852 | error = device_add(&starget->dev); |
851 | if (error) { | 853 | if (error) { |
852 | dev_err(&starget->dev, "target device_add failed, error %d\n", error); | 854 | dev_err(&starget->dev, "target device_add failed, error %d\n", error); |
@@ -886,11 +888,13 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) | |||
886 | return error; | 888 | return error; |
887 | 889 | ||
888 | transport_configure_device(&starget->dev); | 890 | transport_configure_device(&starget->dev); |
891 | device_enable_async_suspend(&sdev->sdev_gendev); | ||
889 | error = device_add(&sdev->sdev_gendev); | 892 | error = device_add(&sdev->sdev_gendev); |
890 | if (error) { | 893 | if (error) { |
891 | printk(KERN_INFO "error 1\n"); | 894 | printk(KERN_INFO "error 1\n"); |
892 | goto out_remove; | 895 | goto out_remove; |
893 | } | 896 | } |
897 | device_enable_async_suspend(&sdev->sdev_dev); | ||
894 | error = device_add(&sdev->sdev_dev); | 898 | error = device_add(&sdev->sdev_dev); |
895 | if (error) { | 899 | if (error) { |
896 | printk(KERN_INFO "error 2\n"); | 900 | printk(KERN_INFO "error 2\n"); |