summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorChristian Marcheselli <christianm@valvesoftware.com>2023-09-18 11:17:35 -0700
committerPierre-Loup A. Griffais <pgriffais@valvesoftware.com>2023-11-02 16:08:09 -0700
commit66fa15aa5603fc9d042696363f906abf297bd074 (patch)
treeac68d78eaf0ac5532866a0e5d8ec39bfc50f410f /drivers
parenta83dd2711b8f5b1370a51805c1d038ed94b08780 (diff)
downloadlinux-66fa15aa5603fc9d042696363f906abf297bd074.tar.gz
Revert "mhi: host: assert wake DB only in valid PM state in mhi_intvec_threaded_handler"
This reverts commit 4cb8ca7274de547cfa8f3bb42e4a0164a91de952.

Reverting debugging commits~
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bus/mhi/host/main.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
index ee4b43b17e8a..a7aa06b58d90 100644
--- a/drivers/bus/mhi/host/main.c
+++ b/drivers/bus/mhi/host/main.c
@@ -482,23 +482,13 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv)
 	enum mhi_state state;
 	enum mhi_pm_state pm_state = 0;
 	enum mhi_ee_type ee;
-	int ret;
-	bool can_wake;
-
-	can_wake = MHI_WAKE_DB_SET_VALID(mhi_cntrl->pm_state) &&
-	    MHI_WAKE_DB_CLEAR_VALID(mhi_cntrl->pm_state);
 
-	if (can_wake) {
-		ret = mhi_device_get_sync(mhi_cntrl->mhi_dev);
-		if (ret)
-			printk("%s %d: mhi get failed %d\n", __func__, __LINE__, ret);
-	}
+	mhi_device_get_sync(mhi_cntrl->mhi_dev);
 
 	write_lock_irq(&mhi_cntrl->pm_lock);
 	if (!MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) {
 		write_unlock_irq(&mhi_cntrl->pm_lock);
-		if (can_wake)
-			mhi_device_put(mhi_cntrl->mhi_dev);
+		mhi_device_put(mhi_cntrl->mhi_dev);
 		goto exit_intvec;
 	}
 
@@ -515,8 +505,7 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv)
 					       MHI_PM_SYS_ERR_DETECT);
 	}
 	write_unlock_irq(&mhi_cntrl->pm_lock);
-	if (can_wake)
-		mhi_device_put(mhi_cntrl->mhi_dev);
+	mhi_device_put(mhi_cntrl->mhi_dev);
 
 	if (pm_state != MHI_PM_SYS_ERR_DETECT)
 		goto exit_intvec;