Skip to contentSkip to conversation

ARM: davinci: clock: return 0 upon error from clk_round_rate()

PATCH New Paul Walmsley 2 participants 2 messages Nov 27, 2013

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

PATCH 1/1 ARM: davinci: clock: return 0 upon error from clk_round_rate()

clk_round_rate() should return 0 now upon an error, rather than returning a negative error code. This is because clk_round_rate() is being changed to return an unsigned return type rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Cc Philip Avinash <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>

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

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

  arch/arm/mach-davinci/clock.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/clock.c +1 -1
index dc9a470ff9c5..985e5fd00fb2 100644
@@ -133,7 +133,7 @@ EXPORT_SYMBOL(clk_get_rate);
  long clk_round_rate(struct clk *clk, unsigned long rate)
  {
  	if (clk == NULL || IS_ERR(clk))
-		return -EINVAL;
+		return 0;
 
  	if (clk->round_rate)
  		return clk->round_rate(clk, rate);
#1 lore raw

PATCH 1/1 ARM: davinci: clock: return 0 upon error from clk_round_rate()

Quoted 10 lines · Paul Walmsley

clk_round_rate() should return 0 now upon an error, rather than returning a negative error code. This is because clk_round_rate() is being changed to return an unsigned return type rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.

Cc Philip Avinash <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>

I applied this to my v3.14/soc[1] branch. For some reason I could not apply the patch to v3.11-rc1 (patch command returns error). Nothing is obviously worng. Anyway, the change is minor so I made the change manually.

Thanks,
Sekhar

[1]
https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/log/?h=v3.14/soc