On Thu, Sep 25, 2008 at 10:53:54AM +0300, Tony Lindgren wrote:
> Minor checkpatch and formatting clean-up. Also update copyrights.
looks ok, assuming it doesn't get broken by any changes
from the review comments i've made earlier in the series.
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-omap.c | 28 ++++++++++++++++------------
> 1 files changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 5c54864..a41b655 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -2,13 +2,15 @@
> * TI OMAP I2C master mode driver
> *
> * Copyright (C) 2003 MontaVista Software, Inc.
> - * Copyright (C) 2004 Texas Instruments.
> - *
> - * Updated to work with multiple I2C interfaces on 24xx by
> - * Tony Lindgren <tony@xxxxxxxxxxx> and Imre Deak <imre.deak@xxxxxxxxx>
> * Copyright (C) 2005 Nokia Corporation
> + * Copyright (C) 2004 - 2007 Texas Instruments.
> *
> - * Cleaned up by Juha Yrjölä <juha.yrjola@xxxxxxxxx>
> + * Originally written by MontaVista Software, Inc.
> + * Additional contributions by:
> + * Tony Lindgren <tony@xxxxxxxxxxx>
> + * Imre Deak <imre.deak@xxxxxxxxx>
> + * Juha Yrjölä <juha.yrjola@xxxxxxxxx>
> + * Syed Khasim <x0khasim@xxxxxx>
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> @@ -33,8 +35,7 @@
> #include <linux/completion.h>
> #include <linux/platform_device.h>
> #include <linux/clk.h>
> -
> -#include <asm/io.h>
> +#include <linux/io.h>
>
> /* timeout waiting for the controller to respond */
> #define OMAP_I2C_TIMEOUT (msecs_to_jiffies(1000))
> @@ -215,7 +216,7 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
> dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
> omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
> if (dev->rev1)
> - iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG); /* Read clears */
> + iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG); /* Read clears */
> else
> omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, dev->iestate);
> /*
> @@ -334,9 +335,9 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>
> /* Enable interrupts */
> omap_i2c_write_reg(dev, OMAP_I2C_IE_REG,
> - (OMAP_I2C_IE_XRDY | OMAP_I2C_IE_RRDY |
> - OMAP_I2C_IE_ARDY | OMAP_I2C_IE_NACK |
> - OMAP_I2C_IE_AL) | ((dev->fifo_size) ?
> + (OMAP_I2C_IE_XRDY | OMAP_I2C_IE_RRDY |
> + OMAP_I2C_IE_ARDY | OMAP_I2C_IE_NACK |
> + OMAP_I2C_IE_AL) | ((dev->fifo_size) ?
> (OMAP_I2C_IE_RDR | OMAP_I2C_IE_XDR) : 0));
> return 0;
> }
> @@ -402,8 +403,10 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
> w |= OMAP_I2C_CON_XA;
> if (!(msg->flags & I2C_M_RD))
> w |= OMAP_I2C_CON_TRX;
> +
> if (!dev->b_hw && stop)
> w |= OMAP_I2C_CON_STP;
> +
> omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
>
> /*
> @@ -476,7 +479,8 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
>
> omap_i2c_unidle(dev);
>
> - if ((r = omap_i2c_wait_for_bb(dev)) < 0)
> + r = omap_i2c_wait_for_bb(dev);
> + if (r < 0)
> goto out;
>
> for (i = 0; i < num; i++) {
> --
> 1.5.6.rc3.21.g8c6b5
>
>
> _______________________________________________
> i2c mailing list
> i2c@xxxxxxxxxxxxxx
> http://lists.lm-sensors.org/mailman/listinfo/i2c
--
Ben (ben@xxxxxxxxx, http://www.fluff.org/)
'a smiley only costs 4 bytes'
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
