Skip to contentSkip to conversation

ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an error

PATCH New Paul Walmsley 3 participants 3 messages Nov 27, 2013 – Nov 28, 2013

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

PATCH 1/1 ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an 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 Laurent Pinchart <[email protected]>
Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>

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

     http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
  arch/arm/mach-shmobile/board-mackerel.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-shmobile/board-mackerel.c +2 -2
index af06753eb809..d90d2f11071b 100644
@@ -548,9 +548,9 @@ static void __init hdmi_init_pm_clock(void)
  		 clk_get_rate(&sh7372_pllc2_clk));
 
  	rate = clk_round_rate(&sh7372_pllc2_clk, 594000000);
-	if (rate < 0) {
+	if (rate <= 0) {
  		pr_err("Cannot get suitable rate: %ld\n", rate);
-		ret = rate;
+		ret = -EINVAL;
  		goto out;
  	}
#1 lore raw

PATCH 1/1 ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an error

Hi Paul,

Thank you for the patch.

Quoted 11 lines · On Tuesday 26 November 2013 16:49:38 Paul Walmsley wrote:

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 Laurent Pinchart <[email protected]>
Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Quoted 24 lines

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

     http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
  arch/arm/mach-shmobile/board-mackerel.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-shmobile/board-mackerel.c index af06753eb809..d90d2f11071b 100644

arch/arm/mach-shmobile/board-mackerel.c +2 -2
@@ -548,9 +548,9 @@ static void __init hdmi_init_pm_clock(void)
  		 clk_get_rate(&sh7372_pllc2_clk));
 
  	rate = clk_round_rate(&sh7372_pllc2_clk, 594000000);
-	if (rate < 0) {
+	if (rate <= 0) {
  		pr_err("Cannot get suitable rate: %ld\n", rate);
-		ret = rate;
+		ret = -EINVAL;
  		goto out;
  	}
Signature · 3 lines
Regards,

Laurent Pinchart
#2 lore raw

PATCH 1/1 ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an error

In reply to Paul Walmsley
Quoted 16 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.

Cc Laurent Pinchart <[email protected]>
Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Quoted 7 lines

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

    http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
 arch/arm/mach-shmobile/board-mackerel.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks Paul,

I have queued this up.

Quoted 22 lines
arch/arm/mach-shmobile/board-mackerel.c +2 -3
index af06753eb809..d90d2f11071b 100644
@@ -548,9 +548,9 @@ static void __init hdmi_init_pm_clock(void)
 		 clk_get_rate(&sh7372_pllc2_clk));
 
 	rate = clk_round_rate(&sh7372_pllc2_clk, 594000000);
-	if (rate < 0) {
+	if (rate <= 0) {
 		pr_err("Cannot get suitable rate: %ld\n", rate);
-		ret = rate;
+		ret = -EINVAL;
 		goto out;
 	}
 
--

To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html