This commit simplifies the temperature exception event handling by
removing the `ufshcd_temp_exception_event_handler` function and directly
calling `ufs_hwmon_notify_event` in the `ufshcd_exception_event_handler`
function.

The `ufshcd_temp_exception_event_handler` function contained a
placeholder comment for platform vendors to add additional steps if
required. However, since its introduction a few years ago, no vendor has
added any additional steps. Therefore, the placeholder function is
removed to streamline the code.

Signed-off-by: Avri Altman <avri.altman@wdc.com>

---
Changes compared to v1:
 - Remove patch #2 - Add missing ABI documentation (Guenter)
---
 drivers/ufs/core/ufshcd.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 0920a443588c..f6c38cf10382 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5976,24 +5976,6 @@ static void ufshcd_bkops_exception_event_handler(struct ufs_hba *hba)
 				__func__, err);
 }
 
-static void ufshcd_temp_exception_event_handler(struct ufs_hba *hba, u16 status)
-{
-	u32 value;
-
-	if (ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR,
-				QUERY_ATTR_IDN_CASE_ROUGH_TEMP, 0, 0, &value))
-		return;
-
-	dev_info(hba->dev, "exception Tcase %d\n", value - 80);
-
-	ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);
-
-	/*
-	 * A placeholder for the platform vendors to add whatever additional
-	 * steps required
-	 */
-}
-
 static int __ufshcd_wb_toggle(struct ufs_hba *hba, bool set, enum flag_idn idn)
 {
 	u8 index;
@@ -6214,7 +6196,7 @@ static void ufshcd_exception_event_handler(struct work_struct *work)
 		ufshcd_bkops_exception_event_handler(hba);
 
 	if (status & hba->ee_drv_mask & MASK_EE_URGENT_TEMP)
-		ufshcd_temp_exception_event_handler(hba, status);
+		ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);
 
 	ufs_debugfs_exception_event(hba, status);
 }
-- 
2.25.1

On Tue, 14 Jan 2025 20:12:05 +0200, Avri Altman wrote:

> This commit simplifies the temperature exception event handling by
> removing the `ufshcd_temp_exception_event_handler` function and directly
> calling `ufs_hwmon_notify_event` in the `ufshcd_exception_event_handler`
> function.
> 
> The `ufshcd_temp_exception_event_handler` function contained a
> placeholder comment for platform vendors to add additional steps if
> required. However, since its introduction a few years ago, no vendor has
> added any additional steps. Therefore, the placeholder function is
> removed to streamline the code.
> 
> [...]

Applied to 6.14/scsi-fixes, thanks!

[1/1] scsi: ufs: core: Simplify temperature exception event handling
      https://git.kernel.org/mkp/scsi/c/8c09f612b293

-- 
Martin K. Petersen	Oracle Linux Engineering

Avri,

> This commit simplifies the temperature exception event handling by
> removing the `ufshcd_temp_exception_event_handler` function and directly
> calling `ufs_hwmon_notify_event` in the `ufshcd_exception_event_handler`
> function.

Applied to 6.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

On 1/14/25 10:12 AM, Avri Altman wrote:
> This commit simplifies the temperature exception event handling by
> removing the `ufshcd_temp_exception_event_handler` function and directly
> calling `ufs_hwmon_notify_event` in the `ufshcd_exception_event_handler`
> function.
> 
> The `ufshcd_temp_exception_event_handler` function contained a
> placeholder comment for platform vendors to add additional steps if
> required. However, since its introduction a few years ago, no vendor has
> added any additional steps. Therefore, the placeholder function is
> removed to streamline the code.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

On Tue, 2025-01-14 at 20:12 +0200, Avri Altman wrote:
> This commit simplifies the temperature exception event handling by
> removing the `ufshcd_temp_exception_event_handler` function and
> directly
> calling `ufs_hwmon_notify_event` in the
> `ufshcd_exception_event_handler`
> function.
> 
> The `ufshcd_temp_exception_event_handler` function contained a
> placeholder comment for platform vendors to add additional steps if
> required. However, since its introduction a few years ago, no vendor
> has
> added any additional steps. Therefore, the placeholder function is
> removed to streamline the code.
> 
> Signed-off-by: Avri Altman <avri.altman@wdc.com>
at the moment, removing this is ok.

Reviewed-by: Bean Huo <beanhuo@micron.com>