tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Fix implicit enum conversion in ufs

Browse Source 
A backport for HID support declared new attribute idns as part of a new
anonymous enum instead of enum attr_idn to preserve the android16-6.12
ABI. These were not cast to the correct enum when used, causing the
kernelci build errors like the following:

drivers/ufs/core/ufs-sysfs.c: In function ‘analysis_trigger_store’:
drivers/ufs/core/ufs-sysfs.c:1681:25: error: implicit conversion from ‘enum <anonymous>’ to ‘enum attr_idn’ [-Werror=enum-conversion]
 1681 |                         QUERY_ATTR_IDN_HID_DEFRAG_OPERATION, &mode);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Cast QUERY_ATTR_IDN_HID_* to enum attr_idn.

Fixes: ba125a42ce ("BACKPORT: FROMGIT: scsi: ufs: core: Add HID support")
Change-Id: I9c690b3feb17f64d54cb218acba92ce4b128e4de
Signed-off-by: Tiffany Yang <ynaffit@google.com>
This commit is contained in:
Tiffany Yang
2025-08-05 13:42:19 -07:00
committed by Treehugger Robot
parent 78c6c49396
commit 052da8f4d4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ufs/core/ufs-sysfs.c
+7 -7
View File
@@ -1678,7 +1678,7 @@ static ssize_t analysis_trigger_store(struct device *dev,
return -EINVAL;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR,
QUERY_ATTR_IDN_HID_DEFRAG_OPERATION, &mode);
(enum attr_idn)QUERY_ATTR_IDN_HID_DEFRAG_OPERATION, &mode);
return ret < 0 ? ret : count;
}
@@ -1700,7 +1700,7 @@ static ssize_t defrag_trigger_store(struct device *dev,
return -EINVAL;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR,
QUERY_ATTR_IDN_HID_DEFRAG_OPERATION, &mode);
(enum attr_idn)QUERY_ATTR_IDN_HID_DEFRAG_OPERATION, &mode);
return ret < 0 ? ret : count;
}
@@ -1715,7 +1715,7 @@ static ssize_t fragmented_size_show(struct device *dev,
int ret;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR,
QUERY_ATTR_IDN_HID_AVAILABLE_SIZE, &value);
(enum attr_idn)QUERY_ATTR_IDN_HID_AVAILABLE_SIZE, &value);
if (ret)
return ret;
@@ -1732,7 +1732,7 @@ static ssize_t defrag_size_show(struct device *dev,
int ret;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR,
QUERY_ATTR_IDN_HID_SIZE, &value);
(enum attr_idn)QUERY_ATTR_IDN_HID_SIZE, &value);
if (ret)
return ret;
@@ -1750,7 +1750,7 @@ static ssize_t defrag_size_store(struct device *dev,
return -EINVAL;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR,
QUERY_ATTR_IDN_HID_SIZE, &value);
(enum attr_idn)QUERY_ATTR_IDN_HID_SIZE, &value);
return ret < 0 ? ret : count;
}
@@ -1765,7 +1765,7 @@ static ssize_t progress_ratio_show(struct device *dev,
int ret;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR,
QUERY_ATTR_IDN_HID_PROGRESS_RATIO, &value);
(enum attr_idn)QUERY_ATTR_IDN_HID_PROGRESS_RATIO, &value);
if (ret)
return ret;
@@ -1782,7 +1782,7 @@ static ssize_t state_show(struct device *dev,
int ret;
ret = hid_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR,
QUERY_ATTR_IDN_HID_STATE, &value);
(enum attr_idn)QUERY_ATTR_IDN_HID_STATE, &value);
if (ret)
return ret;