i2c-s3c2410: Fixup style problems from checkpatch.pl
Fixup the 36 warnings and errors generated from running checkpatch.pl on the driver. The warnings are too numerous to be listed here. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Ben Dooks
parent
1bda71282d
commit
3d0911bfe0
@ -109,7 +109,8 @@ static inline int s3c24xx_i2c_is2440(struct s3c24xx_i2c *i2c)
|
||||
* the default if there is none
|
||||
*/
|
||||
|
||||
static inline struct s3c2410_platform_i2c *s3c24xx_i2c_get_platformdata(struct device *dev)
|
||||
static inline struct s3c2410_platform_i2c *
|
||||
s3c24xx_i2c_get_platformdata(struct device *dev)
|
||||
{
|
||||
if (dev->platform_data != NULL)
|
||||
return (struct s3c2410_platform_i2c *)dev->platform_data;
|
||||
@ -129,7 +130,7 @@ static inline void s3c24xx_i2c_master_complete(struct s3c24xx_i2c *i2c, int ret)
|
||||
|
||||
i2c->msg_ptr = 0;
|
||||
i2c->msg = NULL;
|
||||
i2c->msg_idx ++;
|
||||
i2c->msg_idx++;
|
||||
i2c->msg_num = 0;
|
||||
if (ret)
|
||||
i2c->msg_idx = ret;
|
||||
@ -140,19 +141,17 @@ static inline void s3c24xx_i2c_master_complete(struct s3c24xx_i2c *i2c, int ret)
|
||||
static inline void s3c24xx_i2c_disable_ack(struct s3c24xx_i2c *i2c)
|
||||
{
|
||||
unsigned long tmp;
|
||||
|
||||
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
writel(tmp & ~S3C2410_IICCON_ACKEN, i2c->regs + S3C2410_IICCON);
|
||||
|
||||
}
|
||||
|
||||
static inline void s3c24xx_i2c_enable_ack(struct s3c24xx_i2c *i2c)
|
||||
{
|
||||
unsigned long tmp;
|
||||
|
||||
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
writel(tmp | S3C2410_IICCON_ACKEN, i2c->regs + S3C2410_IICCON);
|
||||
|
||||
}
|
||||
|
||||
/* irq enable/disable functions */
|
||||
@ -160,7 +159,7 @@ static inline void s3c24xx_i2c_enable_ack(struct s3c24xx_i2c *i2c)
|
||||
static inline void s3c24xx_i2c_disable_irq(struct s3c24xx_i2c *i2c)
|
||||
{
|
||||
unsigned long tmp;
|
||||
|
||||
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
writel(tmp & ~S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
|
||||
}
|
||||
@ -168,7 +167,7 @@ static inline void s3c24xx_i2c_disable_irq(struct s3c24xx_i2c *i2c)
|
||||
static inline void s3c24xx_i2c_enable_irq(struct s3c24xx_i2c *i2c)
|
||||
{
|
||||
unsigned long tmp;
|
||||
|
||||
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
writel(tmp | S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
|
||||
}
|
||||
@ -176,10 +175,10 @@ static inline void s3c24xx_i2c_enable_irq(struct s3c24xx_i2c *i2c)
|
||||
|
||||
/* s3c24xx_i2c_message_start
|
||||
*
|
||||
* put the start of a message onto the bus
|
||||
* put the start of a message onto the bus
|
||||
*/
|
||||
|
||||
static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
|
||||
static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
|
||||
struct i2c_msg *msg)
|
||||
{
|
||||
unsigned int addr = (msg->addr & 0x7f) << 1;
|
||||
@ -198,15 +197,15 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
|
||||
if (msg->flags & I2C_M_REV_DIR_ADDR)
|
||||
addr ^= 1;
|
||||
|
||||
// todo - check for wether ack wanted or not
|
||||
/* todo - check for wether ack wanted or not */
|
||||
s3c24xx_i2c_enable_ack(i2c);
|
||||
|
||||
iiccon = readl(i2c->regs + S3C2410_IICCON);
|
||||
writel(stat, i2c->regs + S3C2410_IICSTAT);
|
||||
|
||||
|
||||
dev_dbg(i2c->dev, "START: %08lx to IICSTAT, %02x to DS\n", stat, addr);
|
||||
writeb(addr, i2c->regs + S3C2410_IICDS);
|
||||
|
||||
|
||||
/* delay here to ensure the data byte has gotten onto the bus
|
||||
* before the transaction is started */
|
||||
|
||||
@ -214,8 +213,8 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
|
||||
|
||||
dev_dbg(i2c->dev, "iiccon, %08lx\n", iiccon);
|
||||
writel(iiccon, i2c->regs + S3C2410_IICCON);
|
||||
|
||||
stat |= S3C2410_IICSTAT_START;
|
||||
|
||||
stat |= S3C2410_IICSTAT_START;
|
||||
writel(stat, i2c->regs + S3C2410_IICSTAT);
|
||||
}
|
||||
|
||||
@ -226,11 +225,11 @@ static inline void s3c24xx_i2c_stop(struct s3c24xx_i2c *i2c, int ret)
|
||||
dev_dbg(i2c->dev, "STOP\n");
|
||||
|
||||
/* stop the transfer */
|
||||
iicstat &= ~ S3C2410_IICSTAT_START;
|
||||
iicstat &= ~S3C2410_IICSTAT_START;
|
||||
writel(iicstat, i2c->regs + S3C2410_IICSTAT);
|
||||
|
||||
|
||||
i2c->state = STATE_STOP;
|
||||
|
||||
|
||||
s3c24xx_i2c_master_complete(i2c, ret);
|
||||
s3c24xx_i2c_disable_irq(i2c);
|
||||
}
|
||||
@ -240,7 +239,7 @@ static inline void s3c24xx_i2c_stop(struct s3c24xx_i2c *i2c, int ret)
|
||||
|
||||
/* is_lastmsg()
|
||||
*
|
||||
* returns TRUE if the current message is the last in the set
|
||||
* returns TRUE if the current message is the last in the set
|
||||
*/
|
||||
|
||||
static inline int is_lastmsg(struct s3c24xx_i2c *i2c)
|
||||
@ -288,14 +287,14 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
|
||||
case STATE_STOP:
|
||||
dev_err(i2c->dev, "%s: called in STATE_STOP\n", __func__);
|
||||
s3c24xx_i2c_disable_irq(i2c);
|
||||
s3c24xx_i2c_disable_irq(i2c);
|
||||
goto out_ack;
|
||||
|
||||
case STATE_START:
|
||||
/* last thing we did was send a start condition on the
|
||||
* bus, or started a new i2c message
|
||||
*/
|
||||
|
||||
|
||||
if (iicstat & S3C2410_IICSTAT_LASTBIT &&
|
||||
!(i2c->msg->flags & I2C_M_IGNORE_NAK)) {
|
||||
/* ack was not received... */
|
||||
@ -321,7 +320,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
if (i2c->state == STATE_READ)
|
||||
goto prepare_read;
|
||||
|
||||
/* fall through to the write state, as we will need to
|
||||
/* fall through to the write state, as we will need to
|
||||
* send a byte as well */
|
||||
|
||||
case STATE_WRITE:
|
||||
@ -338,7 +337,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
}
|
||||
}
|
||||
|
||||
retry_write:
|
||||
retry_write:
|
||||
|
||||
if (!is_msgend(i2c)) {
|
||||
byte = i2c->msg->buf[i2c->msg_ptr++];
|
||||
@ -358,9 +357,9 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
dev_dbg(i2c->dev, "WRITE: Next Message\n");
|
||||
|
||||
i2c->msg_ptr = 0;
|
||||
i2c->msg_idx ++;
|
||||
i2c->msg_idx++;
|
||||
i2c->msg++;
|
||||
|
||||
|
||||
/* check to see if we need to do another message */
|
||||
if (i2c->msg->flags & I2C_M_NOSTART) {
|
||||
|
||||
@ -374,7 +373,6 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
|
||||
goto retry_write;
|
||||
} else {
|
||||
|
||||
/* send the new start */
|
||||
s3c24xx_i2c_message_start(i2c, i2c->msg);
|
||||
i2c->state = STATE_START;
|
||||
@ -388,7 +386,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
break;
|
||||
|
||||
case STATE_READ:
|
||||
/* we have a byte of data in the data register, do
|
||||
/* we have a byte of data in the data register, do
|
||||
* something with it, and then work out wether we are
|
||||
* going to do any more read/write
|
||||
*/
|
||||
@ -396,13 +394,13 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
byte = readb(i2c->regs + S3C2410_IICDS);
|
||||
i2c->msg->buf[i2c->msg_ptr++] = byte;
|
||||
|
||||
prepare_read:
|
||||
prepare_read:
|
||||
if (is_msglast(i2c)) {
|
||||
/* last byte of buffer */
|
||||
|
||||
if (is_lastmsg(i2c))
|
||||
s3c24xx_i2c_disable_ack(i2c);
|
||||
|
||||
|
||||
} else if (is_msgend(i2c)) {
|
||||
/* ok, we've read the entire buffer, see if there
|
||||
* is anything else we need to do */
|
||||
@ -428,7 +426,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
|
||||
/* acknowlegde the IRQ and get back on with the work */
|
||||
|
||||
out_ack:
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
tmp &= ~S3C2410_IICCON_IRQPEND;
|
||||
writel(tmp, i2c->regs + S3C2410_IICCON);
|
||||
out:
|
||||
@ -449,19 +447,19 @@ static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id)
|
||||
status = readl(i2c->regs + S3C2410_IICSTAT);
|
||||
|
||||
if (status & S3C2410_IICSTAT_ARBITR) {
|
||||
// deal with arbitration loss
|
||||
/* deal with arbitration loss */
|
||||
dev_err(i2c->dev, "deal with arbitration loss\n");
|
||||
}
|
||||
|
||||
if (i2c->state == STATE_IDLE) {
|
||||
dev_dbg(i2c->dev, "IRQ: error i2c->state == IDLE\n");
|
||||
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
tmp = readl(i2c->regs + S3C2410_IICCON);
|
||||
tmp &= ~S3C2410_IICCON_IRQPEND;
|
||||
writel(tmp, i2c->regs + S3C2410_IICCON);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
/* pretty much this leaves us with the fact that we've
|
||||
* transmitted or received whatever byte we last sent */
|
||||
|
||||
@ -484,7 +482,7 @@ static int s3c24xx_i2c_set_master(struct s3c24xx_i2c *i2c)
|
||||
|
||||
while (timeout-- > 0) {
|
||||
iicstat = readl(i2c->regs + S3C2410_IICSTAT);
|
||||
|
||||
|
||||
if (!(iicstat & S3C2410_IICSTAT_BUSBUSY))
|
||||
return 0;
|
||||
|
||||
@ -502,7 +500,8 @@ static int s3c24xx_i2c_set_master(struct s3c24xx_i2c *i2c)
|
||||
* this starts an i2c transfer
|
||||
*/
|
||||
|
||||
static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num)
|
||||
static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
|
||||
struct i2c_msg *msgs, int num)
|
||||
{
|
||||
unsigned long timeout;
|
||||
int ret;
|
||||
@ -528,12 +527,12 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
|
||||
s3c24xx_i2c_enable_irq(i2c);
|
||||
s3c24xx_i2c_message_start(i2c, msgs);
|
||||
spin_unlock_irq(&i2c->lock);
|
||||
|
||||
|
||||
timeout = wait_event_timeout(i2c->wait, i2c->msg_num == 0, HZ * 5);
|
||||
|
||||
ret = i2c->msg_idx;
|
||||
|
||||
/* having these next two as dev_err() makes life very
|
||||
/* having these next two as dev_err() makes life very
|
||||
* noisy when doing an i2cdetect */
|
||||
|
||||
if (timeout == 0)
|
||||
@ -642,7 +641,7 @@ static inline int freq_acceptable(unsigned int freq, unsigned int wanted)
|
||||
{
|
||||
int diff = freq - wanted;
|
||||
|
||||
return (diff >= -2 && diff <= 2);
|
||||
return diff >= -2 && diff <= 2;
|
||||
}
|
||||
|
||||
/* s3c24xx_i2c_clockrate
|
||||
@ -665,7 +664,7 @@ static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got)
|
||||
|
||||
pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent);
|
||||
clkin /= 1000; /* clkin now in KHz */
|
||||
|
||||
|
||||
dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n",
|
||||
pdata, pdata->bus_freq, pdata->min_freq, pdata->max_freq);
|
||||
|
||||
@ -773,7 +772,7 @@ static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
|
||||
|
||||
/* s3c24xx_i2c_init
|
||||
*
|
||||
* initialise the controller, set the IO lines and frequency
|
||||
* initialise the controller, set the IO lines and frequency
|
||||
*/
|
||||
|
||||
static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
|
||||
@ -792,7 +791,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
|
||||
s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPE14_IICSCL);
|
||||
|
||||
/* write slave address */
|
||||
|
||||
|
||||
writeb(pdata->slave_addr, i2c->regs + S3C2410_IICADD);
|
||||
|
||||
dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
|
||||
@ -877,7 +876,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
|
||||
goto err_ioarea;
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
|
||||
dev_dbg(&pdev->dev, "registers %p (%p, %p)\n",
|
||||
i2c->regs, i2c->ioarea, res);
|
||||
|
||||
/* setup info block for the i2c core */
|
||||
|
||||
@ -891,7 +891,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
|
||||
goto err_iomap;
|
||||
|
||||
/* find the IRQ for this unit (note, this relies on the init call to
|
||||
* ensure no current IRQs pending
|
||||
* ensure no current IRQs pending
|
||||
*/
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
@ -910,7 +910,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
i2c->irq = res;
|
||||
|
||||
|
||||
dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
|
||||
(unsigned long)res->start);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user