i2c: fsl_i2c: Fix style violations

Fix some style violations in the fsl_i2c I2C driver, and use shorter
type names for variables in some cases.

Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index ff3dc25927a004487ef9bf97f6711d03e52cdc4e..d957cf6286ba3637bcfd2ae4985a88b2dfa5c260 100644 (file)
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -116,10 +116,10 @@ static const struct {
  *
  * The return value is the actual bus speed that is set.
  */
-static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,
-       unsigned int i2c_clk, unsigned int speed)
+static uint set_i2c_bus_speed(const struct fsl_i2c_base *base,
+                             uint i2c_clk, uint speed)
 {
-       unsigned short divider = min(i2c_clk / speed, (unsigned int)USHRT_MAX);
+       ushort divider = min(i2c_clk / speed, (uint)USHRT_MAX);
 
        /*
         * We want to choose an FDR/DFSR that generates an I2C bus speed that
@@ -130,8 +130,8 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,
 #ifdef __PPC__
        u8 dfsr, fdr = 0x31; /* Default if no FDR found */
        /* a, b and dfsr matches identifiers A,B and C respectively in AN2919 */
-       unsigned short a, b, ga, gb;
-       unsigned long c_div, est_div;
+       ushort a, b, ga, gb;
+       ulong c_div, est_div;
 
 #ifdef CONFIG_FSL_I2C_CUSTOM_DFSR
        dfsr = CONFIG_FSL_I2C_CUSTOM_DFSR;
@@ -151,18 +151,21 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,
        for (ga = 0x4, a = 10; a <= 30; ga++, a += 2) {
                for (gb = 0; gb < 8; gb++) {
                        b = 16 << gb;
-                       c_div = b * (a + ((3*dfsr)/b)*2);
-                       if ((c_div > divider) && (c_div < est_div)) {
-                               unsigned short bin_gb, bin_ga;
+                       c_div = b * (a + ((3 * dfsr) / b) * 2);
+                       if (c_div > divider && c_div < est_div) {
+                               ushort bin_gb, bin_ga;
 
                                est_div = c_div;
                                bin_gb = gb << 2;
                                bin_ga = (ga & 0x3) | ((ga & 0x4) << 3);
                                fdr = bin_gb | bin_ga;
                                speed = i2c_clk / est_div;
-                               debug("FDR:0x%.2x, div:%ld, ga:0x%x, gb:0x%x, "
-                                     "a:%d, b:%d, speed:%d\n",
-                                     fdr, est_div, ga, gb, a, b, speed);
+
+                               debug("FDR: 0x%.2x, ", fdr);
+                               debug("div: %ld, ", est_div);
+                               debug("ga: 0x%x, gb: 0x%x, ", ga, gb);
+                               debug("a: %d, b: %d, speed: %d\n", a, b, speed);
+
                                /* Condition 2 not accounted for */
                                debug("Tr <= %d ns\n",
                                      (b - 3 * dfsr) * 1000000 /
@@ -174,13 +177,13 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,
                if (a == 24)
                        a += 4;
        }
-       debug("divider:%d, est_div:%ld, DFSR:%d\n", divider, est_div, dfsr);
-       debug("FDR:0x%.2x, speed:%d\n", fdr, speed);
+       debug("divider: %d, est_div: %ld, DFSR: %d\n", divider, est_div, dfsr);
+       debug("FDR: 0x%.2x, speed: %d\n", fdr, speed);
 #endif
        writeb(dfsr, &base->dfsrr);     /* set default filter */
        writeb(fdr, &base->fdr);        /* set bus speed */
 #else
-       unsigned int i;
+       uint i;
 
        for (i = 0; i < ARRAY_SIZE(fsl_i2c_speed_map); i++)
                if (fsl_i2c_speed_map[i].divider >= divider) {
@@ -197,7 +200,7 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,
 }
 
 #ifndef CONFIG_DM_I2C
-static unsigned int get_i2c_clock(int bus)
+static uint get_i2c_clock(int bus)
 {
        if (bus)
                return gd->arch.i2c2_clk;       /* I2C2 clock */
@@ -211,10 +214,11 @@ static int fsl_i2c_fixup(const struct fsl_i2c_base *base)
        const unsigned long long timeout = usec2ticks(CONFIG_I2C_MBB_TIMEOUT);
        unsigned long long timeval = 0;
        int ret = -1;
-       unsigned int flags = 0;
+       uint flags = 0;
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_I2C_A004447
-       unsigned int svr = get_svr();
+       uint svr = get_svr();
+
        if ((SVR_SOC_VER(svr) == SVR_8548 && IS_SVR_REV(svr, 3, 1)) ||
            (SVR_REV(svr) <= CONFIG_SYS_FSL_A004447_SVR_REV))
                flags = I2C_CR_BIT6;
@@ -263,7 +267,7 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int
        /* Call board specific i2c bus reset routine before accessing the
         * environment, which might be in a chip on that bus. For details
         * about this problem see doc/I2C_Edge_Conditions.
-       */
+        */
        i2c_init_board();
 #endif
        writeb(0, &base->cr);           /* stop I2C controller */
@@ -286,8 +290,7 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int
        }
 }
 
-static int
-i2c_wait4bus(const struct fsl_i2c_base *base)
+static int i2c_wait4bus(const struct fsl_i2c_base *base)
 {
        unsigned long long timeval = get_ticks();
        const unsigned long long timeout = usec2ticks(CONFIG_I2C_MBB_TIMEOUT);
@@ -300,8 +303,7 @@ i2c_wait4bus(const struct fsl_i2c_base *base)
        return 0;
 }
 
-static inline int
-i2c_wait(const struct fsl_i2c_base *base, int write)
+static inline int i2c_wait(const struct fsl_i2c_base *base, int write)
 {
        u32 csr;
        unsigned long long timeval = get_ticks();
@@ -317,29 +319,29 @@ i2c_wait(const struct fsl_i2c_base *base, int write)
                writeb(0x0, &base->sr);
 
                if (csr & I2C_SR_MAL) {
-                       debug("i2c_wait: MAL\n");
+                       debug("%s: MAL\n", __func__);
                        return -1;
                }
 
                if (!(csr & I2C_SR_MCF))        {
-                       debug("i2c_wait: unfinished\n");
+                       debug("%s: unfinished\n", __func__);
                        return -1;
                }
 
                if (write == I2C_WRITE_BIT && (csr & I2C_SR_RXAK)) {
-                       debug("i2c_wait: No RXACK\n");
+                       debug("%s: No RXACK\n", __func__);
                        return -1;
                }
 
                return 0;
        } while ((get_ticks() - timeval) < timeout);
 
-       debug("i2c_wait: timed out\n");
+       debug("%s: timed out\n", __func__);
        return -1;
 }
 
-static inline int
-i2c_write_addr(const struct fsl_i2c_base *base, u8 dev, u8 dir, int rsta)
+static inline int i2c_write_addr(const struct fsl_i2c_base *base, u8 dev,
+                                u8 dir, int rsta)
 {
        writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX
               | (rsta ? I2C_CR_RSTA : 0),
@@ -353,8 +355,8 @@ i2c_write_addr(const struct fsl_i2c_base *base, u8 dev, u8 dir, int rsta)
        return 1;
 }
 
-static inline int
-__i2c_write_data(const struct fsl_i2c_base *base, u8 *data, int length)
+static inline int __i2c_write_data(const struct fsl_i2c_base *base, u8 *data,
+                                  int length)
 {
        int i;
 
@@ -368,8 +370,8 @@ __i2c_write_data(const struct fsl_i2c_base *base, u8 *data, int length)
        return i;
 }
 
-static inline int
-__i2c_read_data(const struct fsl_i2c_base *base, u8 *data, int length)
+static inline int __i2c_read_data(const struct fsl_i2c_base *base, u8 *data,
+                                 int length)
 {
        int i;
 
@@ -399,9 +401,8 @@ __i2c_read_data(const struct fsl_i2c_base *base, u8 *data, int length)
        return i;
 }
 
-static int
-__i2c_read(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,
-          u8 *data, int dlen)
+static int __i2c_read(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset,
+                     int olen, u8 *data, int dlen)
 {
        int ret = -1; /* signal error */
 
@@ -447,9 +448,8 @@ __i2c_read(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,
        return -1;
 }
 
-static int
-__i2c_write(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,
-           u8 *data, int dlen)
+static int __i2c_write(const struct fsl_i2c_base *base, u8 chip_addr,
+                      u8 *offset, int olen, u8 *data, int dlen)
 {
        int ret = -1; /* signal error */
 
@@ -471,10 +471,9 @@ __i2c_write(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,
        return -1;
 }
 
-static int
-__i2c_probe_chip(const struct fsl_i2c_base *base, uchar chip)
+static int __i2c_probe_chip(const struct fsl_i2c_base *base, uchar chip)
 {
-       /* For unknow reason the controller will ACK when
+       /* For unknown reason the controller will ACK when
         * probing for a slave with the same address, so skip
         * it.
         */
@@ -484,8 +483,8 @@ __i2c_probe_chip(const struct fsl_i2c_base *base, uchar chip)
        return __i2c_read(base, chip, 0, 0, NULL, 0);
 }
 
-static unsigned int __i2c_set_bus_speed(const struct fsl_i2c_base *base,
-                       unsigned int speed, int i2c_clk)
+static uint __i2c_set_bus_speed(const struct fsl_i2c_base *base,
+                               uint speed, int i2c_clk)
 {
        writeb(0, &base->cr);           /* stop controller */
        set_i2c_bus_speed(base, i2c_clk, speed);
@@ -501,32 +500,30 @@ static void fsl_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
                   get_i2c_clock(adap->hwadapnr), adap->hwadapnr);
 }
 
-static int
-fsl_i2c_probe_chip(struct i2c_adapter *adap, uchar chip)
+static int fsl_i2c_probe_chip(struct i2c_adapter *adap, uchar chip)
 {
        return __i2c_probe_chip(i2c_base[adap->hwadapnr], chip);
 }
 
-static int
-fsl_i2c_read(struct i2c_adapter *adap, u8 chip_addr, uint offset, int olen,
-            u8 *data, int dlen)
+static int fsl_i2c_read(struct i2c_adapter *adap, u8 chip_addr, uint offset,
+                       int olen, u8 *data, int dlen)
 {
        u8 *o = (u8 *)&offset;
+
        return __i2c_read(i2c_base[adap->hwadapnr], chip_addr, &o[4 - olen],
                          olen, data, dlen);
 }
 
-static int
-fsl_i2c_write(struct i2c_adapter *adap, u8 chip_addr, uint offset, int olen,
-             u8 *data, int dlen)
+static int fsl_i2c_write(struct i2c_adapter *adap, u8 chip_addr, uint offset,
+                        int olen, u8 *data, int dlen)
 {
        u8 *o = (u8 *)&offset;
+
        return __i2c_write(i2c_base[adap->hwadapnr], chip_addr, &o[4 - olen],
                           olen, data, dlen);
 }
 
-static unsigned int fsl_i2c_set_bus_speed(struct i2c_adapter *adap,
-                                         unsigned int speed)
+static uint fsl_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed)
 {
        return __i2c_set_bus_speed(i2c_base[adap->hwadapnr], speed,
                                   get_i2c_clock(adap->hwadapnr));
@@ -562,12 +559,14 @@ static int fsl_i2c_probe_chip(struct udevice *bus, u32 chip_addr,
                              u32 chip_flags)
 {
        struct fsl_i2c_dev *dev = dev_get_priv(bus);
+
        return __i2c_probe_chip(dev->base, chip_addr);
 }
 
-static int fsl_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
+static int fsl_i2c_set_bus_speed(struct udevice *bus, uint speed)
 {
        struct fsl_i2c_dev *dev = dev_get_priv(bus);
+
        return __i2c_set_bus_speed(dev->base, speed, dev->i2c_clk);
 }
 
@@ -600,6 +599,7 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)
 static int fsl_i2c_probe(struct udevice *bus)
 {
        struct fsl_i2c_dev *dev = dev_get_priv(bus);
+
        __i2c_init(dev->base, dev->speed, dev->slaveadd, dev->i2c_clk,
                   dev->index);
        return 0;
@@ -613,7 +613,8 @@ static int fsl_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
        memset(&dummy, 0, sizeof(struct i2c_msg));
 
        /* We expect either two messages (one with an offset and one with the
-        * actucal data) or one message (just data) */
+        * actual data) or one message (just data)
+        */
        if (nmsgs > 2 || nmsgs == 0) {
                debug("%s: Only one or two messages are supported.", __func__);
                return -1;