Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8101a300 authored by Wolfgang Grandegger's avatar Wolfgang Grandegger Committed by Ben Dooks
Browse files

i2c: i2c-mpc: various coding style fixes 



Fix errors reported by checkpatch (indention, long lines, trailing
white space, etc.).

Signed-off-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 309c18d2

drivers/i2c/busses/i2c-mpc.c

+18 −17
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/of_platform.h>

#include <linux/of_i2c.h>



#include <asm/io.h>

#include <linux/io.h>

#include <linux/fsl_devices.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>
@@ -58,7 +58,7 @@ struct mpc_i2c { 
	u32 flags;

};



static __inline__ void writeccr(struct mpc_i2c *i2c, u32 x)

static inline void writeccr(struct mpc_i2c *i2c, u32 x)

{

	writeb(x, i2c->base + MPC_I2C_CR);

}
@@ -100,8 +100,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) 
	u32 x;

	int result = 0;



	if (i2c->irq == NO_IRQ)

	{

	if (i2c->irq == NO_IRQ) {

		while (!(readb(i2c->base + MPC_I2C_SR) & CSR_MIF)) {

			schedule();

			if (time_after(jiffies, orig_jiffies + timeout)) {
@@ -311,7 +310,8 @@ static struct i2c_adapter mpc_ops = { 
	.timeout = HZ,

};



static int __devinit fsl_i2c_probe(struct of_device *op, const struct of_device_id *match)

static int __devinit fsl_i2c_probe(struct of_device *op,

				   const struct of_device_id *match)

{

	int result = 0;

	struct mpc_i2c *i2c;
@@ -341,7 +341,8 @@ static int __devinit fsl_i2c_probe(struct of_device *op, const struct of_device_ 
		result = request_irq(i2c->irq, mpc_i2c_isr,

				     IRQF_SHARED, "i2c-mpc", i2c);

		if (result < 0) {

			printk(KERN_ERR "i2c-mpc - failed to attach interrupt\n");

			printk(KERN_ERR

			       "i2c-mpc - failed to attach interrupt\n");

			goto fail_request;

		}

	}
@@ -428,6 +429,6 @@ module_init(fsl_i2c_init); 
module_exit(fsl_i2c_exit);



MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");

MODULE_DESCRIPTION

    ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");

MODULE_DESCRIPTION("I2C-Bus adapter for MPC107 bridge and "

		   "MPC824x/85xx/52xx processors");

MODULE_LICENSE("GPL");