mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 07:33:56 +00:00
i2c-omap: Clean-up i2c-omap
Minor sparse, checkpatch and formatting clean-up. Also update copyrights. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
43469d8e2a
commit
c1a473bde4
@ -2,13 +2,16 @@
|
|||||||
* TI OMAP I2C master mode driver
|
* TI OMAP I2C master mode driver
|
||||||
*
|
*
|
||||||
* Copyright (C) 2003 MontaVista Software, Inc.
|
* Copyright (C) 2003 MontaVista Software, Inc.
|
||||||
* Copyright (C) 2004 Texas Instruments.
|
|
||||||
*
|
|
||||||
* Updated to work with multiple I2C interfaces on 24xx by
|
|
||||||
* Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com>
|
|
||||||
* Copyright (C) 2005 Nokia Corporation
|
* Copyright (C) 2005 Nokia Corporation
|
||||||
|
* Copyright (C) 2004 - 2007 Texas Instruments.
|
||||||
*
|
*
|
||||||
* Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com>
|
* Originally written by MontaVista Software, Inc.
|
||||||
|
* Additional contributions by:
|
||||||
|
* Tony Lindgren <tony@atomide.com>
|
||||||
|
* Imre Deak <imre.deak@nokia.com>
|
||||||
|
* Juha Yrjölä <juha.yrjola@solidboot.com>
|
||||||
|
* Syed Khasim <x0khasim@ti.com>
|
||||||
|
* Nishant Menon <nm@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -33,8 +36,7 @@
|
|||||||
#include <linux/completion.h>
|
#include <linux/completion.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
|
#include <linux/io.h>
|
||||||
#include <asm/io.h>
|
|
||||||
|
|
||||||
/* timeout waiting for the controller to respond */
|
/* timeout waiting for the controller to respond */
|
||||||
#define OMAP_I2C_TIMEOUT (msecs_to_jiffies(1000))
|
#define OMAP_I2C_TIMEOUT (msecs_to_jiffies(1000))
|
||||||
@ -389,8 +391,10 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
|
|||||||
w |= OMAP_I2C_CON_XA;
|
w |= OMAP_I2C_CON_XA;
|
||||||
if (!(msg->flags & I2C_M_RD))
|
if (!(msg->flags & I2C_M_RD))
|
||||||
w |= OMAP_I2C_CON_TRX;
|
w |= OMAP_I2C_CON_TRX;
|
||||||
|
|
||||||
if (!dev->b_hw && stop)
|
if (!dev->b_hw && stop)
|
||||||
w |= OMAP_I2C_CON_STP;
|
w |= OMAP_I2C_CON_STP;
|
||||||
|
|
||||||
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -468,7 +472,8 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
|
|||||||
|
|
||||||
omap_i2c_unidle(dev);
|
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;
|
goto out;
|
||||||
|
|
||||||
for (i = 0; i < num; i++) {
|
for (i = 0; i < num; i++) {
|
||||||
@ -561,7 +566,7 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
|
|||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define omap_i2c_rev1_isr 0
|
#define omap_i2c_rev1_isr NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static irqreturn_t
|
static irqreturn_t
|
||||||
|
Loading…
Reference in New Issue
Block a user