ANDROID: Revert "scsi: block: Do not accept any requests while suspended"
Commit "block: Do not accept any requests while suspended" broke the UFS
driver. In the upstream kernel this has been fixed by commit b294ff3e3449
("scsi: ufs: core: Enable power management for wlun"). Backporting that
commit or backporting the entire v5.14-rc1 UFS driver is too risky.
Hence revert the block layer patch that is incompatible with the v5.10
UFS driver power management code.
This reverts commit d55d15a332
.
Bug: 193181075
Change-Id: Ic50d4e1df98d7ed393bf9797787225ae22e5d7a3
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
@@ -694,18 +694,6 @@ static inline bool queue_is_mq(struct request_queue *q)
|
||||
return q->mq_ops;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static inline enum rpm_status queue_rpm_status(struct request_queue *q)
|
||||
{
|
||||
return q->rpm_status;
|
||||
}
|
||||
#else
|
||||
static inline enum rpm_status queue_rpm_status(struct request_queue *q)
|
||||
{
|
||||
return RPM_ACTIVE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline enum blk_zoned_model
|
||||
blk_queue_zoned_model(struct request_queue *q)
|
||||
{
|
||||
|
Reference in New Issue
Block a user