diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-nomadik.c')
-rw-r--r-- | drivers/i2c/busses/i2c-nomadik.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 73de8ade10b1..a73c057f63fd 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2009 ST-Ericsson | 2 | * Copyright (C) 2009 ST-Ericsson SA |
3 | * Copyright (C) 2009 STMicroelectronics | 3 | * Copyright (C) 2009 STMicroelectronics |
4 | * | 4 | * |
5 | * I2C master mode controller driver, used in Nomadik 8815 | 5 | * I2C master mode controller driver, used in Nomadik 8815 |
@@ -431,7 +431,6 @@ static int read_i2c(struct nmk_i2c_dev *dev) | |||
431 | (void) init_hw(dev); | 431 | (void) init_hw(dev); |
432 | status = -ETIMEDOUT; | 432 | status = -ETIMEDOUT; |
433 | } | 433 | } |
434 | |||
435 | return status; | 434 | return status; |
436 | } | 435 | } |
437 | 436 | ||
@@ -502,9 +501,9 @@ static int write_i2c(struct nmk_i2c_dev *dev) | |||
502 | 501 | ||
503 | /** | 502 | /** |
504 | * nmk_i2c_xfer() - I2C transfer function used by kernel framework | 503 | * nmk_i2c_xfer() - I2C transfer function used by kernel framework |
505 | * @i2c_adap - Adapter pointer to the controller | 504 | * @i2c_adap: Adapter pointer to the controller |
506 | * @msgs[] - Pointer to data to be written. | 505 | * @msgs: Pointer to data to be written. |
507 | * @num_msgs - Number of messages to be executed | 506 | * @num_msgs: Number of messages to be executed |
508 | * | 507 | * |
509 | * This is the function called by the generic kernel i2c_transfer() | 508 | * This is the function called by the generic kernel i2c_transfer() |
510 | * or i2c_smbus...() API calls. Note that this code is protected by the | 509 | * or i2c_smbus...() API calls. Note that this code is protected by the |
@@ -605,6 +604,7 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
605 | /** | 604 | /** |
606 | * disable_interrupts() - disable the interrupts | 605 | * disable_interrupts() - disable the interrupts |
607 | * @dev: private data of controller | 606 | * @dev: private data of controller |
607 | * @irq: interrupt number | ||
608 | */ | 608 | */ |
609 | static int disable_interrupts(struct nmk_i2c_dev *dev, u32 irq) | 609 | static int disable_interrupts(struct nmk_i2c_dev *dev, u32 irq) |
610 | { | 610 | { |