tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

i2c: imx: whitespace and checkpatch cleanup

This patch fixes up some whitespace issues and addresses a few
checkpatch warnings.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

authored by

Philipp Zabel and committed by
Wolfram Sang 4e355f51 a5eb71b2

+13 -10
+13 -10
drivers/i2c/busses/i2c-imx.c
··· 201 201 void __iomem *base; 202 202 wait_queue_head_t queue; 203 203 unsigned long i2csr; 204 - unsigned int disable_delay; 204 + unsigned int disable_delay; 205 205 int stopped; 206 206 unsigned int ifdr; /* IMX_I2C_IFDR */ 207 207 unsigned int cur_clk; ··· 479 479 i2c_clk_rate = clk_get_rate(i2c_imx->clk); 480 480 if (i2c_imx->cur_clk == i2c_clk_rate) 481 481 return; 482 - else 483 - i2c_imx->cur_clk = i2c_clk_rate; 482 + 483 + i2c_imx->cur_clk = i2c_clk_rate; 484 484 485 485 div = (i2c_clk_rate + i2c_imx->bitrate - 1) / i2c_imx->bitrate; 486 486 if (div < i2c_clk_div[0].div) ··· 488 488 else if (div > i2c_clk_div[i2c_imx->hwdata->ndivs - 1].div) 489 489 i = i2c_imx->hwdata->ndivs - 1; 490 490 else 491 - for (i = 0; i2c_clk_div[i].div < div; i++); 491 + for (i = 0; i2c_clk_div[i].div < div; i++) 492 + ; 492 493 493 494 /* Store divider value */ 494 495 i2c_imx->ifdr = i2c_clk_div[i].val; ··· 821 820 /* read data */ 822 821 for (i = 0; i < msgs->len; i++) { 823 822 u8 len = 0; 823 + 824 824 result = i2c_imx_trx_complete(i2c_imx); 825 825 if (result) 826 826 return result; ··· 917 915 /* write/read data */ 918 916 #ifdef CONFIG_I2C_DEBUG_BUS 919 917 temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR); 920 - dev_dbg(&i2c_imx->adapter.dev, "<%s> CONTROL: IEN=%d, IIEN=%d, " 921 - "MSTA=%d, MTX=%d, TXAK=%d, RSTA=%d\n", __func__, 918 + dev_dbg(&i2c_imx->adapter.dev, 919 + "<%s> CONTROL: IEN=%d, IIEN=%d, MSTA=%d, MTX=%d, TXAK=%d, RSTA=%d\n", 920 + __func__, 922 921 (temp & I2CR_IEN ? 1 : 0), (temp & I2CR_IIEN ? 1 : 0), 923 922 (temp & I2CR_MSTA ? 1 : 0), (temp & I2CR_MTX ? 1 : 0), 924 923 (temp & I2CR_TXAK ? 1 : 0), (temp & I2CR_RSTA ? 1 : 0)); 925 924 temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR); 926 925 dev_dbg(&i2c_imx->adapter.dev, 927 - "<%s> STATUS: ICF=%d, IAAS=%d, IBB=%d, " 928 - "IAL=%d, SRW=%d, IIF=%d, RXAK=%d\n", __func__, 926 + "<%s> STATUS: ICF=%d, IAAS=%d, IBB=%d, IAL=%d, SRW=%d, IIF=%d, RXAK=%d\n", 927 + __func__, 929 928 (temp & I2SR_ICF ? 1 : 0), (temp & I2SR_IAAS ? 1 : 0), 930 929 (temp & I2SR_IBB ? 1 : 0), (temp & I2SR_IAL ? 1 : 0), 931 930 (temp & I2SR_SRW ? 1 : 0), (temp & I2SR_IIF ? 1 : 0), ··· 1005 1002 i2c_imx->adapter.owner = THIS_MODULE; 1006 1003 i2c_imx->adapter.algo = &i2c_imx_algo; 1007 1004 i2c_imx->adapter.dev.parent = &pdev->dev; 1008 - i2c_imx->adapter.nr = pdev->id; 1005 + i2c_imx->adapter.nr = pdev->id; 1009 1006 i2c_imx->adapter.dev.of_node = pdev->dev.of_node; 1010 1007 i2c_imx->base = base; 1011 1008 ··· 1064 1061 i2c_imx->adapter.name); 1065 1062 dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); 1066 1063 1067 - /* Init DMA config if support*/ 1064 + /* Init DMA config if supported */ 1068 1065 i2c_imx_dma_request(i2c_imx, phy_addr); 1069 1066 1070 1067 return 0; /* Return OK */