arm64: mvebu: armada-7k/8k: drop useless #ifdef

[u-boot] / drivers / i2c / stm32f7_i2c.c

diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 346748d433142d6109bd390f1a32a850311bc353..86624878e2eacc77cfe2cf42bd8793d5d8a44b04 100644 (file)
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -640,7 +640,7 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,
                                      struct stm32_i2c_setup *setup,
                                      struct stm32_i2c_timings *output)
 {
-       struct stm32_i2c_timings *v, *_v, s;
+       struct stm32_i2c_timings *v, *_v;
        struct list_head solutions;
        int ret;
 
@@ -676,16 +676,10 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,
        if (ret)
                goto exit;
 
-       ret = stm32_i2c_choose_solution(setup, &solutions, &s);
+       ret = stm32_i2c_choose_solution(setup, &solutions, output);
        if (ret)
                goto exit;
 
-       output->presc = s.presc;
-       output->scldel = s.scldel;
-       output->sdadel = s.sdadel;
-       output->scll = s.scll;
-       output->sclh = s.sclh;
-
        debug("%s: Presc: %i, scldel: %i, sdadel: %i, scll: %i, sclh: %i\n",
              __func__, output->presc,
              output->scldel, output->sdadel,