Skip to contentSkip to conversation

blackfin: bf60x: clock: return 0 upon error from clk_round_rate()

PATCH Applied Paul Walmsley 2 participants 2 messages Nov 27, 2013 – Dec 3, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blackfin: bf60x: clock: return 0 upon error from clk_round_rate()

clk_round_rate() should return 0 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 Steven Miao <[email protected]>
Cc Bob Liu <[email protected]>
Cc Mike Frysinger <[email protected]>

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

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

 arch/blackfin/mach-bf609/clock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/blackfin/mach-bf609/clock.c +1 -1
index dab8849af884..3f5323d3e116 100644
@@ -131,7 +131,7 @@ EXPORT_SYMBOL(clk_get_rate);
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
-	long ret = -EIO;
+	long ret = 0;
 	if (clk->ops && clk->ops->round_rate)
 		ret = clk->ops->round_rate(clk, rate);
 	return ret;
Applied
#1 lore raw

Hi Paul,

Applied to next 3.14 tree. Thanks!

Quoted 32 lines · Paul Walmsley

clk_round_rate() should return 0 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 Steven Miao <[email protected]>
Cc Bob Liu <[email protected]>
Cc Mike Frysinger <[email protected]>

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

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

 arch/blackfin/mach-bf609/clock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/blackfin/mach-bf609/clock.c +1 -1
index dab8849af884..3f5323d3e116 100644
@@ -131,7 +131,7 @@ EXPORT_SYMBOL(clk_get_rate);
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
-       long ret = -EIO;
+       long ret = 0;
        if (clk->ops && clk->ops->round_rate)
                ret = clk->ops->round_rate(clk, rate);
        return ret;