aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2013-01-24 05:27:46 -0500
committerWolfram Sang <w.sang@pengutronix.de>2013-01-27 23:26:44 -0500
commit876ae85c8b811668c2c115ea78c2241f562977fb (patch)
tree592f6fd8698811d88db00bbdf2956f646e8041c4 /drivers/i2c
parent24e9e157d5197e469a414d0f52ce04e8b539a715 (diff)
i2c: nomadik: drop superfluous variable initialization
cppcheck rightfully reports those as "reassigned a value before the old one has been used." Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index dd6a6913bd73..5b1b1948128e 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -412,8 +412,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
412static int read_i2c(struct nmk_i2c_dev *dev, u16 flags) 412static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
413{ 413{
414 u32 status = 0; 414 u32 status = 0;
415 u32 mcr; 415 u32 mcr, irq_mask;
416 u32 irq_mask = 0;
417 int timeout; 416 int timeout;
418 417
419 mcr = load_i2c_mcr_reg(dev, flags); 418 mcr = load_i2c_mcr_reg(dev, flags);
@@ -482,8 +481,7 @@ static void fill_tx_fifo(struct nmk_i2c_dev *dev, int no_bytes)
482static int write_i2c(struct nmk_i2c_dev *dev, u16 flags) 481static int write_i2c(struct nmk_i2c_dev *dev, u16 flags)
483{ 482{
484 u32 status = 0; 483 u32 status = 0;
485 u32 mcr; 484 u32 mcr, irq_mask;
486 u32 irq_mask = 0;
487 int timeout; 485 int timeout;
488 486
489 mcr = load_i2c_mcr_reg(dev, flags); 487 mcr = load_i2c_mcr_reg(dev, flags);
@@ -731,8 +729,7 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
731 struct nmk_i2c_dev *dev = arg; 729 struct nmk_i2c_dev *dev = arg;
732 u32 tft, rft; 730 u32 tft, rft;
733 u32 count; 731 u32 count;
734 u32 misr; 732 u32 misr, src;
735 u32 src = 0;
736 733
737 /* load Tx FIFO and Rx FIFO threshold values */ 734 /* load Tx FIFO and Rx FIFO threshold values */
738 tft = readl(dev->virtbase + I2C_TFTR); 735 tft = readl(dev->virtbase + I2C_TFTR);