Skip to contentSkip to conversation

ALSA: at73c213: clk_round_rate() can return a zero upon error

PATCH In review Paul Walmsley 3 participants 5 messages Dec 10, 2013 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: at73c213: clk_round_rate() can return a zero upon error

Treat both negative and zero return values from clk_round_rate()
as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather
than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Eventually, when calling clk_round_rate(), only a return value of zero will be considered a error. All other values will be considered valid rates. The comparison against values less than 0 is kept to preserve the correct behavior in the meantime.

Cc Hans-Christian Egtvedt <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Jaroslav Kysela <[email protected]>

---
Applies on v3.13-rc3. See also:

http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2

 sound/spi/at73c213.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/spi/at73c213.c +1 -1
index 8e3d9a6c7a3b..25c38afaee49 100644
@@ -174,7 +174,7 @@ static int snd_at73c213_set_bitrate(struct snd_at73c213 *chip)
 		dac_rate_new = 8 * (ssc_rate / ssc_div);
 
 		status = clk_round_rate(chip->board->dac_clk, dac_rate_new);
-		if (status < 0)
+		if (status <= 0)
 			return status;
 
 		/* Ignore difference smaller than 256 Hz. */
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Paul Walmsley

Treat both negative and zero return values from clk_round_rate() as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Eventually, when calling clk_round_rate(), only a return value of zero will be considered a error. All other values will be considered valid rates. The comparison against values less than 0 is kept to preserve the correct behavior in the meantime.

Quoted 4 lines
Cc Hans-Christian Egtvedt <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Jaroslav Kysela <[email protected]>

Thanks for fixing.

Quoted 22 lines

---
Applies on v3.13-rc3. See also:

http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2

 sound/spi/at73c213.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/spi/at73c213.c +1 -1
index 8e3d9a6c7a3b..25c38afaee49 100644
@@ -174,7 +174,7 @@ static int snd_at73c213_set_bitrate(struct snd_at73c213 *chip)
 		dac_rate_new = 8 * (ssc_rate / ssc_div);
 
 		status = clk_round_rate(chip->board->dac_clk, dac_rate_new);
-		if (status < 0)
+		if (status <= 0)
 			return status;
 
 		/* Ignore difference smaller than 256 Hz. */
Signature · 2 lines
mvh
Hans-Christian Egtvedt
#2 lore raw
In reply to Paul Walmsley

At Mon, 9 Dec 2013 18:40:48 -0800,

Quoted 13 lines · Paul Walmsley

Treat both negative and zero return values from clk_round_rate() as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Eventually, when calling clk_round_rate(), only a return value of zero will be considered a error. All other values will be considered valid rates. The comparison against values less than 0 is kept to preserve the correct behavior in the meantime.

Quoted 8 lines
Cc Hans-Christian Egtvedt <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Jaroslav Kysela <[email protected]>

---
Applies on v3.13-rc3. See also:

http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2

Is the behavior "returning zero upon error" already in 3.13? That is, should this (and another) patch be taken as a 3.13-fix patch, or it's for 3.14?

thanks,

Takashi

Quoted 18 lines
  sound/spi/at73c213.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
sound/spi/at73c213.c +1 -1
index 8e3d9a6c7a3b..25c38afaee49 100644
@@ -174,7 +174,7 @@ static int snd_at73c213_set_bitrate(struct snd_at73c213 *chip)
  		dac_rate_new = 8 * (ssc_rate / ssc_div);
 
  		status = clk_round_rate(chip->board->dac_clk, dac_rate_new);
-		if (status < 0)
+		if (status <= 0)
  			return status;
 
  		/* Ignore difference smaller than 256 Hz. */
#3 lore raw
Quoted 11 lines · Takashi Iwai
Quoted 6 lines · Paul Walmsley

Treat both negative and zero return values from clk_round_rate() as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Is the behavior "returning zero upon error" already in 3.13? That is, should this (and another) patch be taken as a 3.13-fix patch, or it's for 3.14?

It depends on the platform. The Common Clock Framework code returns 0 upon error right now. But other clock framework implementations, such as the one used by the Atmel AT91 boards, return negative error codes. And looking at the mainline code, it looks like the at73c213 chip is most likely to be used on AT91 boards.

So if you want to send this patch for v3.13-rc, it's probably justified, but it's low-priority. v3.14 is also fine.

I'll be sending some followup patches to the platform maintainers to change the clock framework code to return 0 upon error. But those can't be applied until the drivers are fixed, if we want to avoid regressions in error path handling. So from that point of view, applying these driver patches in v3.13-rc would mean there is less delay to getting the platform clock framework fixes upstream :-)

- Paul

#4 lore raw

At Tue, 10 Dec 2013 11:46:43 -0800,

Quoted 24 lines · Paul Walmsley
Quoted 11 lines · Takashi Iwai
Quoted 6 lines · Paul Walmsley

Treat both negative and zero return values from clk_round_rate() as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Is the behavior "returning zero upon error" already in 3.13? That is, should this (and another) patch be taken as a 3.13-fix patch, or it's for 3.14?

It depends on the platform. The Common Clock Framework code returns 0 upon error right now. But other clock framework implementations, such as the one used by the Atmel AT91 boards, return negative error codes. And looking at the mainline code, it looks like the at73c213 chip is most likely to be used on AT91 boards.

So if you want to send this patch for v3.13-rc, it's probably justified, but it's low-priority. v3.14 is also fine.

Quoted 6 lines

I'll be sending some followup patches to the platform maintainers to change the clock framework code to return 0 upon error. But those can't be applied until the drivers are fixed, if we want to avoid regressions in error path handling. So from that point of view, applying these driver patches in v3.13-rc would mean there is less delay to getting the platform clock framework fixes upstream :-)

OK, unless any known regressions are reported, I'm inclined to put this for 3.14. Now applied to for-next branch. Thanks!

Takashi