From: hgchu Date: Fri, 12 Jan 2018 05:30:56 +0000 (+0900) Subject: scsi: do not async suspend for scsi devices X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8608bb2e0d692dd654564e5a0633ff255bbeefaf;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git scsi: do not async suspend for scsi devices Change-Id: I19209feb10653ef0ddb08c242004cad080469233 Signed-off-by: hgchu --- diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index dd9464920456..7fba0e32d9b5 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -245,7 +245,6 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, pm_runtime_get_noresume(&shost->shost_gendev); pm_runtime_set_active(&shost->shost_gendev); pm_runtime_enable(&shost->shost_gendev); - device_enable_async_suspend(&shost->shost_gendev); error = device_add(&shost->shost_gendev); if (error) @@ -254,8 +253,6 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 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; diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 528ac9070efe..0ffb333d1c6a 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1237,7 +1237,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) transport_configure_device(&starget->dev); - device_enable_async_suspend(&sdev->sdev_gendev); scsi_autopm_get_target(starget); pm_runtime_set_active(&sdev->sdev_gendev); pm_runtime_forbid(&sdev->sdev_gendev); @@ -1262,7 +1261,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) return error; } - device_enable_async_suspend(&sdev->sdev_dev); error = device_add(&sdev->sdev_dev); if (error) { sdev_printk(KERN_INFO, sdev,