Skip to contentSkip to conversation

hwrng: stm32 - use swap() in stm32_rng_probe()

PATCH In review Thorsten Blum 3 participants 3 messages Oct 1 – Oct 8

Subsystems (3)
Crypto API Arm STM32 Hardware random number generator core
lore
Share & tools
lore

Thorsten Blum

author
#0 lore raw

PATCH 1/1 hwrng: stm32 - use swap() in stm32_rng_probe()

Use swap() to simplify stm32_rng_probe().

Signed-off-by Thorsten Blum <[email protected]>
---
 drivers/char/hw_random/stm32-rng.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/char/hw_random/stm32-rng.c +2 -9
index d3fc910f674a..b13361dcad12 100644
@@ -569,18 +569,11 @@ static int stm32_rng_probe(struct platform_device *ofdev)
 		return dev_err_probe(dev, -EINVAL, "Failed to get clocks: %d\n", ret);
 
 	if (priv->data->nb_clock == 2) {
-		const char *id = priv->clk_bulk[1].id;
-		struct clk *clk = priv->clk_bulk[1].clk;
-
 		if (!priv->clk_bulk[0].id || !priv->clk_bulk[1].id)
 			return dev_err_probe(dev, -EINVAL, "Missing clock name\n");
 
-		if (strcmp(priv->clk_bulk[0].id, "core")) {
-			priv->clk_bulk[1].id = priv->clk_bulk[0].id;
-			priv->clk_bulk[1].clk = priv->clk_bulk[0].clk;
-			priv->clk_bulk[0].id = id;
-			priv->clk_bulk[0].clk = clk;
-		}
+		if (strcmp(priv->clk_bulk[0].id, "core"))
+			swap(priv->clk_bulk[0], priv->clk_bulk[1]);
 	}
 
 	pm_runtime_set_autosuspend_delay(dev, 100);
Acked-by on v1 1/1
#1 lore raw
Acked-by Maxime Méré <[email protected]>
Quoted 33 lines · Thorsten Blum

Use swap() to simplify stm32_rng_probe().

Signed-off-by Thorsten Blum <[email protected]>
---
  drivers/char/hw_random/stm32-rng.c | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
drivers/char/hw_random/stm32-rng.c +2 -9
index d3fc910f674a..b13361dcad12 100644
@@ -569,18 +569,11 @@ static int stm32_rng_probe(struct platform_device *ofdev)
  		return dev_err_probe(dev, -EINVAL, "Failed to get clocks: %d\n", ret);
 
  	if (priv->data->nb_clock == 2) {
-		const char *id = priv->clk_bulk[1].id;
-		struct clk *clk = priv->clk_bulk[1].clk;
-
  		if (!priv->clk_bulk[0].id || !priv->clk_bulk[1].id)
  			return dev_err_probe(dev, -EINVAL, "Missing clock name\n");
 
-		if (strcmp(priv->clk_bulk[0].id, "core")) {
-			priv->clk_bulk[1].id = priv->clk_bulk[0].id;
-			priv->clk_bulk[1].clk = priv->clk_bulk[0].clk;
-			priv->clk_bulk[0].id = id;
-			priv->clk_bulk[0].clk = clk;
-		}
+		if (strcmp(priv->clk_bulk[0].id, "core"))
+			swap(priv->clk_bulk[0], priv->clk_bulk[1]);
  	}
 
  	pm_runtime_set_autosuspend_delay(dev, 100);
maintainer
#2 lore raw
In reply to Thorsten Blum
Quoted 6 lines · Thorsten Blum

Use swap() to simplify stm32_rng_probe().

Signed-off-by Thorsten Blum <[email protected]>
---
 drivers/char/hw_random/stm32-rng.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt