imx: i2c: Zap unnecessary malloc() calls

This board uses setup_i2c() in SPL. The setup_i2c() function internally calls gpio_request(), which in turn internally calls strdup(). The strdup() requires a running mallocator, so this patch makes the mallocator available.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

This board uses setup_i2c() in SPL. The setup_i2c() function internally calls gpio_request(), which in turn internally calls strdup(). The strdup() requires a running mallocator, so this patch makes the mallocator available.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---
 include/configs/novena.h | 1 +
 1 file changed, 1 insertion(+)

include/configs/novena.h +0 -0

index 879141a..0f3621a 100644

Just zap multiple spaces and replace them with tabs properly.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Sequence like the following is completely useless and results from an errorneous ordering of the statements during development. Zap it.
#ifdef FOO
#define FOO

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Pull the definitions of GPIOs into a separate header file, so that they can be used across all source files.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Pull all of the video handling into a separate file, since a lot more code will be added and such code would polute the board file.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Repair the register configuration and add proper support for the display attached to both LVDS channels.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---
 board/kosagi/novena/novena.c     |   8 +
 board/kosagi/novena/novena.h     |   8 +
 board/kosagi/novena/novena_spl.c |   7 +
 board/kosagi/novena/video.c      | 400 ++++++++++++++++++++++++++++++++++++---
 include/configs/novena.h         |   1 +
 5 files changed, 401 insertions(+), 23 deletions(-)

Hi Marek,

Quoted 12 lines · Marek Vasut

Repair the register configuration and add proper support for the display attached to both LVDS channels.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Quoted 7 lines

 board/kosagi/novena/novena.c     |   8 +
 board/kosagi/novena/novena.h     |   8 +
 board/kosagi/novena/novena_spl.c |   7 +
 board/kosagi/novena/video.c      | 400
 ++++++++++++++++++++++++++++++++++++--- include/configs/novena.h       
  |   1 +
 5 files changed, 401 insertions(+), 23 deletions(-)

Could perhaps move the board to driver model for I2C.

Repair the register configuration and add proper support for the display attached to both LVDS channels.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---
 arch/arm/imx-common/i2c-mxv7.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

arch/arm/imx-common/i2c-mxv7.c +8 -17

index 34f5387..1a632e7 100644
@@ -73,26 +73,21 @@ static void * const i2c_bases[] = {
 int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
              struct i2c_pads_info *p)
 {
-       char *name1, *name2;
+       char name[9];
        int ret;
 
        if (i2c_index >= ARRAY_SIZE(i2c_bases))
                return -EINVAL;
 
-       name1 = malloc(9);
-       name2 = malloc(9);
-       if (!name1 || !name2)
-               return -ENOMEM;
-
-       sprintf(name1, "i2c_sda%d", i2c_index);
-       sprintf(name2, "i2c_scl%d", i2c_index);
-       ret = gpio_request(p->sda.gp, name1);
+       snprintf(name, sizeof(name), "i2c_sda%01d", i2c_index);
+       ret = gpio_request(p->sda.gp, name);
        if (ret)
-               goto err_req1;
+               return ret;
 
-       ret = gpio_request(p->scl.gp, name2);
+       snprintf(name, sizeof(name), "i2c_scl%01d", i2c_index);
+       ret = gpio_request(p->scl.gp, name);
        if (ret)
-               goto err_req2;
+               goto err_req;
 
        /* Enable i2c clock */
        ret = enable_i2c_clk(1, i2c_index);

@@ -112,11 +107,8 @@ int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
 err_idle:
 err_clk:
        gpio_free(p->scl.gp);
-err_req2:
+err_req:
        gpio_free(p->sda.gp);
-err_req1:
-       free(name1);
-       free(name2);
 
        return ret;
 }
--

2.1.3

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---
 arch/arm/imx-common/i2c-mxv7.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

arch/arm/imx-common/i2c-mxv7.c +1 -1

index 34f5387..1a632e7 100644
@@ -73,26 +73,21 @@ static void * const i2c_bases[] = {
 int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
              struct i2c_pads_info *p)
 {
-       char *name1, *name2;
+       char name[9];
        int ret;
 
        if (i2c_index >= ARRAY_SIZE(i2c_bases))
                return -EINVAL;
 

arch/arm/imx-common/i2c-mxv7.c +5 -8

        if (ret)
-               goto err_req1;
+               return ret;
 
-       ret = gpio_request(p->scl.gp, name2);
+       snprintf(name, sizeof(name), "i2c_scl%01d", i2c_index);
+       ret = gpio_request(p->scl.gp, name);
        if (ret)
-               goto err_req2;
+               goto err_req;
 
        /* Enable i2c clock */
        ret = enable_i2c_clk(1, i2c_index);

@@ -112,11 +107,8 @@ int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
 err_idle:
 err_clk:
        gpio_free(p->scl.gp);
-err_req2:
+err_req:
        gpio_free(p->sda.gp);
-err_req1:
-       free(name1);
-       free(name2);
 
        return ret;
 }
--

2.1.3

Hi Marek,

Quoted 38 lines · Marek Vasut

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

 arch/arm/imx-common/i2c-mxv7.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(quoted diff) +0 -0

b/arch/arm/imx-common/i2c-mxv7.c index 34f5387..1a632e7 100644

arch/arm/imx-common/i2c-mxv7.c +1 -1

@@ -73,26 +73,21 @@ static void * const i2c_bases[] = {
 
 int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
 
              struct i2c_pads_info *p)
 
 {
 
-       char *name1, *name2;
+       char name[9];
 
        int ret;
 
        if (i2c_index >= ARRAY_SIZE(i2c_bases))
 
                return -EINVAL;
 

arch/arm/imx-common/i2c-mxv7.c static void * const i2c_bases[] = { · line 83

Quoted 10 lines

arch/arm/imx-common/i2c-mxv7.c +2 -8

-       name1 = malloc(9);
-       name2 = malloc(9);
-       if (!name1 || !name2)
-               return -ENOMEM;
-
-       sprintf(name1, "i2c_sda%d", i2c_index);
-       sprintf(name2, "i2c_scl%d", i2c_index);
-       ret = gpio_request(p->sda.gp, name1);
+       snprintf(name, sizeof(name), "i2c_sda%01d", i2c_index);
+       ret = gpio_request(p->sda.gp, name);

Does this board use driver model? If not it should be easy to convert since one MX6 board supports it. With driver model there is gpio_requestf("i2c_sda%01d", i2c_index);

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows.

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Quoted 5 lines · Marek Vasut

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows.

Quoted 8 lines

Signed-off-by Marek Vasut <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Sean Cross <[email protected]>

Cc Simon Glass <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

---

Applied to u-boot-imx, thanks !