Skip to content

L
linux
Commit 8abf6fbb authored by Jonas Aaberg's avatar Jonas Aaberg Committed by Ben Dooks
Browse files
Options

i2c-nomadik: cosmetic coding style corrections 

This fixes a number of whitespace and punctuation problems
around the Nomadik I2C driver.
Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 1fdb24e9
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 43 deletions
drivers/i2c/busses/i2c-nomadik.c
View file @ 8abf6fbb
...@@ -63,11 +63,11 @@ ...@@ -63,11 +63,11 @@
/* Master controller (MCR) register */ /* Master controller (MCR) register */
#define I2C_MCR_OP (0x1 << 0) /* Operation */ #define I2C_MCR_OP (0x1 << 0) /* Operation */
#define I2C_MCR_A7 (0x7f << 1) /* 7-bit address */ #define I2C_MCR_A7 (0x7f << 1) /* 7-bit address */
#define I2C_MCR_EA10 (0x7 << 8) /* 10-bit Extended address */ #define I2C_MCR_EA10 (0x7 << 8) /* 10-bit Extended address */
#define I2C_MCR_SB (0x1 << 11) /* Extended address */ #define I2C_MCR_SB (0x1 << 11) /* Extended address */
#define I2C_MCR_AM (0x3 << 12) /* Address type */ #define I2C_MCR_AM (0x3 << 12) /* Address type */
#define I2C_MCR_STOP (0x1 << 14) /* Stop condition */ #define I2C_MCR_STOP (0x1 << 14) /* Stop condition */
#define I2C_MCR_LENGTH (0x7ff << 15) /* Transaction length */ #define I2C_MCR_LENGTH (0x7ff << 15) /* Transaction length */
/* Status register (SR) */ /* Status register (SR) */
#define I2C_SR_OP (0x3 << 0) /* Operation */ #define I2C_SR_OP (0x3 << 0) /* Operation */
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
#define I2C_SR_LENGTH (0x7ff << 9) /* Transfer length */ #define I2C_SR_LENGTH (0x7ff << 9) /* Transfer length */
/* Interrupt mask set/clear (IMSCR) bits */ /* Interrupt mask set/clear (IMSCR) bits */
#define I2C_IT_TXFE (0x1 << 0) #define I2C_IT_TXFE (0x1 << 0)
#define I2C_IT_TXFNE (0x1 << 1) #define I2C_IT_TXFNE (0x1 << 1)
#define I2C_IT_TXFF (0x1 << 2) #define I2C_IT_TXFF (0x1 << 2)
#define I2C_IT_TXFOVR (0x1 << 3) #define I2C_IT_TXFOVR (0x1 << 3)
...@@ -135,31 +135,31 @@ struct i2c_nmk_client { ...@@ -135,31 +135,31 @@ struct i2c_nmk_client {
}; };
/** /**
* struct nmk_i2c_dev - private data structure of the controller * struct nmk_i2c_dev - private data structure of the controller.
* @pdev: parent platform device * @pdev: parent platform device.
* @adap: corresponding I2C adapter * @adap: corresponding I2C adapter.
* @irq: interrupt line for the controller * @irq: interrupt line for the controller.
* @virtbase: virtual io memory area * @virtbase: virtual io memory area.
* @clk: hardware i2c block clock * @clk: hardware i2c block clock.
* @cfg: machine provided controller configuration * @cfg: machine provided controller configuration.
* @cli: holder of client specific data * @cli: holder of client specific data.
* @stop: stop condition * @stop: stop condition.
* @xfer_complete: acknowledge completion for a I2C message * @xfer_complete: acknowledge completion for a I2C message.
* @result: controller propogated result * @result: controller propogated result.
* @regulator: pointer to i2c regulator * @regulator: pointer to i2c regulator.
* @busy: Busy doing transfer * @busy: Busy doing transfer.
*/ */
struct nmk_i2c_dev { struct nmk_i2c_dev {
struct platform_device *pdev; struct platform_device *pdev;
struct i2c_adapter adap; struct i2c_adapter adap;
int irq; int irq;
void __iomem *virtbase; void __iomem *virtbase;
struct clk *clk; struct clk *clk;
struct nmk_i2c_controller cfg; struct nmk_i2c_controller cfg;
struct i2c_nmk_client cli; struct i2c_nmk_client cli;
int stop; int stop;
struct completion xfer_complete; struct completion xfer_complete;
int result; int result;
struct regulator *regulator; struct regulator *regulator;
bool busy; bool busy;
}; };
...@@ -217,8 +217,9 @@ static int flush_i2c_fifo(struct nmk_i2c_dev *dev) ...@@ -217,8 +217,9 @@ static int flush_i2c_fifo(struct nmk_i2c_dev *dev)
} }
} }
dev_err(&dev->pdev->dev, "flushing operation timed out " dev_err(&dev->pdev->dev,
"giving up after %d attempts", LOOP_ATTEMPTS); "flushing operation timed out giving up after %d attempts",
LOOP_ATTEMPTS);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -270,7 +271,7 @@ static int init_hw(struct nmk_i2c_dev *dev) ...@@ -270,7 +271,7 @@ static int init_hw(struct nmk_i2c_dev *dev)
} }
/* enable peripheral, master mode operation */ /* enable peripheral, master mode operation */
#define DEFAULT_I2C_REG_CR ((1 << 1) | I2C_CR_PE) #define DEFAULT_I2C_REG_CR ((1 << 1) | I2C_CR_PE)
/** /**
* load_i2c_mcr_reg() - load the MCR register * load_i2c_mcr_reg() - load the MCR register
...@@ -363,8 +364,8 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev) ...@@ -363,8 +364,8 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
* and high speed (up to 3.4 Mb/s) * and high speed (up to 3.4 Mb/s)
*/ */
if (dev->cfg.sm > I2C_FREQ_MODE_FAST) { if (dev->cfg.sm > I2C_FREQ_MODE_FAST) {
dev_err(&dev->pdev->dev, "do not support this mode " dev_err(&dev->pdev->dev,
"defaulting to std. mode\n"); "do not support this mode defaulting to std. mode\n");
brcr2 = i2c_clk/(100000 * 2) & 0xffff; brcr2 = i2c_clk/(100000 * 2) & 0xffff;
writel((brcr1 | brcr2), dev->virtbase + I2C_BRCR); writel((brcr1 | brcr2), dev->virtbase + I2C_BRCR);
writel(I2C_FREQ_MODE_STANDARD << 4, writel(I2C_FREQ_MODE_STANDARD << 4,
...@@ -423,7 +424,7 @@ static int read_i2c(struct nmk_i2c_dev *dev) ...@@ -423,7 +424,7 @@ static int read_i2c(struct nmk_i2c_dev *dev)
if (timeout < 0) { if (timeout < 0) {
dev_err(&dev->pdev->dev, dev_err(&dev->pdev->dev,
"wait_for_completion_timeout" "wait_for_completion_timeout "
"returned %d waiting for event\n", timeout); "returned %d waiting for event\n", timeout);
status = timeout; status = timeout;
} }
...@@ -556,8 +557,8 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags) ...@@ -556,8 +557,8 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags)
if (((i2c_sr >> 2) & 0x3) == 0x3) { if (((i2c_sr >> 2) & 0x3) == 0x3) {
/* get the abort cause */ /* get the abort cause */
cause = (i2c_sr >> 4) & 0x7; cause = (i2c_sr >> 4) & 0x7;
dev_err(&dev->pdev->dev, "%s\n", cause dev_err(&dev->pdev->dev, "%s\n",
>= ARRAY_SIZE(abort_causes) ? cause >= ARRAY_SIZE(abort_causes) ?
"unknown reason" : "unknown reason" :
abort_causes[cause]); abort_causes[cause]);
} }
...@@ -582,13 +583,13 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags) ...@@ -582,13 +583,13 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags)
* *
* NOTE: * NOTE:
* READ TRANSFER : We impose a restriction of the first message to be the * READ TRANSFER : We impose a restriction of the first message to be the
* index message for any read transaction. * index message for any read transaction.
* - a no index is coded as '0', * - a no index is coded as '0',
* - 2byte big endian index is coded as '3' * - 2byte big endian index is coded as '3'
* !!! msg[0].buf holds the actual index. * !!! msg[0].buf holds the actual index.
* This is compatible with generic messages of smbus emulator * This is compatible with generic messages of smbus emulator
* that send a one byte index. * that send a one byte index.
* eg. a I2C transation to read 2 bytes from index 0 * eg. a I2C transation to read 2 bytes from index 0
* idx = 0; * idx = 0;
* msg[0].addr = client->addr; * msg[0].addr = client->addr;
* msg[0].flags = 0x0; * msg[0].flags = 0x0;
...@@ -644,8 +645,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, ...@@ -644,8 +645,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
for (i = 0; i < num_msgs; i++) { for (i = 0; i < num_msgs; i++) {
if (unlikely(msgs[i].flags & I2C_M_TEN)) { if (unlikely(msgs[i].flags & I2C_M_TEN)) {
dev_err(&dev->pdev->dev, "10 bit addressing" dev_err(&dev->pdev->dev,
"not supported\n"); "10 bit addressing not supported\n");
status = -EINVAL; status = -EINVAL;
goto out; goto out;
...@@ -789,8 +790,9 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) ...@@ -789,8 +790,9 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
if (dev->cli.count) { if (dev->cli.count) {
dev->result = -EIO; dev->result = -EIO;
dev_err(&dev->pdev->dev, "%lu bytes still remain to be" dev_err(&dev->pdev->dev,
"xfered\n", dev->cli.count); "%lu bytes still remain to be xfered\n",
dev->cli.count);
(void) init_hw(dev); (void) init_hw(dev);
} }
complete(&dev->xfer_complete); complete(&dev->xfer_complete);
...@@ -923,7 +925,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) ...@@ -923,7 +925,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
} }
if (request_mem_region(res->start, resource_size(res), if (request_mem_region(res->start, resource_size(res),
DRIVER_NAME "I/O region") == NULL) { DRIVER_NAME "I/O region") == NULL) {
ret = -EBUSY; ret = -EBUSY;
goto err_no_region; goto err_no_region;
} }
...@@ -980,8 +982,9 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) ...@@ -980,8 +982,9 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
i2c_set_adapdata(adap, dev); i2c_set_adapdata(adap, dev);
dev_info(&pdev->dev, "initialize %s on virtual " dev_info(&pdev->dev,
"base %p\n", adap->name, dev->virtbase); "initialize %s on virtual base %p\n",
adap->name, dev->virtbase);
ret = i2c_add_numbered_adapter(adap); ret = i2c_add_numbered_adapter(adap);
if (ret) { if (ret) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7