Skip to content

Commit f4672dc

Browse files
qianfengrongbroonie
authored andcommitted
regmap: use int type to store negative error codes
Change the 'ret' variable from unsigned int to int to store negative error codes or zero returned by regmap_field_read() and regmap_read(), and change '-1' to 'negative errno' in the comments. Storing the negative error codes in unsigned type, doesn't cause an issue at runtime but it's ugly as pants. Additionally, assigning negative error codes to unsigned type may trigger a GCC warning when the -Wsign-conversion flag is enabled. No effect on runtime. Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com> Message-ID: <20250828150702.193288-1-rongqianfeng@vivo.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 5c36b86 commit f4672dc

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/base/regmap/regmap.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,12 +2258,14 @@ EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);
22582258
* @field: Register field to operate on
22592259
* @bits: Bits to test
22602260
*
2261-
* Returns -1 if the underlying regmap_field_read() fails, 0 if at least one of the
2262-
* tested bits is not set and 1 if all tested bits are set.
2261+
* Returns negative errno if the underlying regmap_field_read() fails,
2262+
* 0 if at least one of the tested bits is not set and 1 if all tested
2263+
* bits are set.
22632264
*/
22642265
int regmap_field_test_bits(struct regmap_field *field, unsigned int bits)
22652266
{
2266-
unsigned int val, ret;
2267+
unsigned int val;
2268+
int ret;
22672269

22682270
ret = regmap_field_read(field, &val);
22692271
if (ret)
@@ -3309,7 +3311,8 @@ EXPORT_SYMBOL_GPL(regmap_update_bits_base);
33093311
*/
33103312
int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits)
33113313
{
3312-
unsigned int val, ret;
3314+
unsigned int val;
3315+
int ret;
33133316

33143317
ret = regmap_read(map, reg, &val);
33153318
if (ret)

0 commit comments

Comments
 (0)