Skip to contentSkip to conversation

ASoC: rt1011: Mark format integer literals as unsigned

PATCH In review Nathan Chancellor 3 participants 4 messages Jun 6, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: rt1011: Mark format integer literals as unsigned

Clang warns:

sound/soc/codecs/rt1011.c:1291:12: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                format = 2147483648; /* 2^24 * 128 */
                         ^

sound/soc/codecs/rt1011.c:2123:13: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                        format = 2147483648; /* 2^24 * 128 */
                                 ^

2 warnings generated.

Mark the integer literals as unsigned explicitly so that if the kernel does ever bump the C standard it uses, the behavior is consitent.

Fixes d6e65bb7ff0d ("ASoC: rt1011: Add RT1011 amplifier driver")
---
 sound/soc/codecs/rt1011.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt1011.c +2 -2
index 349d6db7ecd4..3a0ae80c5ee0 100644
@@ -1288,7 +1288,7 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol,
 	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
 		rt1011->r0_reg = ucontrol->value.integer.value[0];
 
-		format = 2147483648; /* 2^24 * 128 */
+		format = 2147483648U; /* 2^24 * 128 */
 		r0_integer = format / rt1011->r0_reg / 128;
 		r0_factor = ((format / rt1011->r0_reg * 100) / 128)
 						- (r0_integer * 100);
@@ -2120,7 +2120,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag)
 			dev_err(dev,	"Calibrate R0 Failure\n");
 			ret = -EAGAIN;
 		} else {
-			format = 2147483648; /* 2^24 * 128 */
+			format = 2147483648U; /* 2^24 * 128 */
 			r0_integer = format / r0[0] / 128;
 			r0_factor = ((format / r0[0] * 100) / 128)
 							- (r0_integer * 100);
Signature · 1 line
2.22.0.rc3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nathan Chancellor

Clang warns:

sound/soc/codecs/rt1011.c:1291:12: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                format = 2147483648; /* 2^24 * 128 */

This number's bitpattern is a leading one followed by 31 zeros. format is declared as unsigned int, and literals in C are signed unless suffixed, so this patch LGTM. Maybe a macro declaring such a bitpattern would improve readability over the existing magic constant and comment?

Quoted 11 lines
                         ^

sound/soc/codecs/rt1011.c:2123:13: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                        format = 2147483648; /* 2^24 * 128 */
                                 ^

2 warnings generated.

Mark the integer literals as unsigned explicitly so that if the kernel does ever bump the C standard it uses, the behavior is consitent.

s/consitent/consistent/

:set spell

:P

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 11 lines · Nick Desaulniers
Quoted 8 lines · Nathan Chancellor

Clang warns:

sound/soc/codecs/rt1011.c:1291:12: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                format = 2147483648; /* 2^24 * 128 */
Quoted 5 lines

This number's bitpattern is a leading one followed by 31 zeros. format is declared as unsigned int, and literals in C are signed unless suffixed, so this patch LGTM. Maybe a macro declaring such a bitpattern would improve readability over the existing magic constant and comment?

I thought about it but that is ultimately up to the maintainer I think.

Quoted 11 lines
Quoted 9 lines
                         ^

sound/soc/codecs/rt1011.c:2123:13: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                        format = 2147483648; /* 2^24 * 128 */
                                 ^

2 warnings generated.

Quoted 6 lines
Quoted 2 lines

Mark the integer literals as unsigned explicitly so that if the kernel does ever bump the C standard it uses, the behavior is consitent.

s/consitent/consistent/

:set spell

Grr... I can send a v2 unless the maintainer wants to manually fix it up. Thank you for the review as always.

Nathan

maintainer
#3 lore raw

Applied "ASoC: rt1011: Mark format integer literals as unsigned" to the asoc tree

In reply to Nathan Chancellor

The patch

ASoC: rt1011: Mark format integer literals as unsigned

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 83a6edbb8fe928e801b9b6cab13e81109b185918 Mon Sep 17 00:00:00 2001

From: Nathan Chancellor <[email protected]>
Date: Wed, 5 Jun 2019 22:12:27 -0700
Subject: [PATCH] ASoC: rt1011: Mark format integer literals as unsigned

Clang warns:

sound/soc/codecs/rt1011.c:1291:12: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                format = 2147483648; /* 2^24 * 128 */
                         ^

sound/soc/codecs/rt1011.c:2123:13: warning: integer literal is too large to be represented in type 'long', interpreting as 'unsigned long' per C89; this literal will have type 'long long' in C99 onwards [-Wc99-compat]

                        format = 2147483648; /* 2^24 * 128 */
                                 ^

2 warnings generated.

Mark the integer literals as unsigned explicitly so that if the kernel does ever bump the C standard it uses, the behavior is consitent.

Fixes d6e65bb7ff0d ("ASoC: rt1011: Add RT1011 amplifier driver")
---
 sound/soc/codecs/rt1011.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt1011.c +2 -2
index 349d6db7ecd4..3a0ae80c5ee0 100644
@@ -1288,7 +1288,7 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol,
 	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
 		rt1011->r0_reg = ucontrol->value.integer.value[0];
 
-		format = 2147483648; /* 2^24 * 128 */
+		format = 2147483648U; /* 2^24 * 128 */
 		r0_integer = format / rt1011->r0_reg / 128;
 		r0_factor = ((format / rt1011->r0_reg * 100) / 128)
 						- (r0_integer * 100);
@@ -2120,7 +2120,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag)
 			dev_err(dev,	"Calibrate R0 Failure\n");
 			ret = -EAGAIN;
 		} else {
-			format = 2147483648; /* 2^24 * 128 */
+			format = 2147483648U; /* 2^24 * 128 */
 			r0_integer = format / r0[0] / 128;
 			r0_factor = ((format / r0[0] * 100) / 128)
 							- (r0_integer * 100);
Signature · 1 line
2.20.1