From: Wolfgang Grandegger <wg@grandegger•com>
To: linux-i2c@vger•kernel.org
Cc: devicetree-discuss@ozlabs•org, linuxppc-dev@ozlabs•org,
Ben Dooks <ben-linux@fluff•org>
Subject: [PATCH v3 1/5] i2c: i2c-mpc: various coding style fixes
Date: Tue, 07 Apr 2009 10:20:53 +0200 [thread overview]
Message-ID: <20090407082231.177941706@denx.de> (raw)
In-Reply-To: 20090407082052.477328750@denx.de
Fix errors reported by checkpatch (indention, long lines, trailing
white space, etc.).
Signed-off-by: Wolfgang Grandegger <wg@grandegger•com>
---
drivers/i2c/busses/i2c-mpc.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
Index: linux-2.6-galak/drivers/i2c/busses/i2c-mpc.c
===================================================================
--- linux-2.6-galak.orig/drivers/i2c/busses/i2c-mpc.c 2009-04-07 10:09:09.400719216 +0200
+++ linux-2.6-galak/drivers/i2c/busses/i2c-mpc.c 2009-04-07 10:09:13.271719088 +0200
@@ -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>
@@ -28,10 +28,10 @@
#define DRV_NAME "mpc-i2c"
-#define MPC_I2C_FDR 0x04
-#define MPC_I2C_CR 0x08
-#define MPC_I2C_SR 0x0c
-#define MPC_I2C_DR 0x10
+#define MPC_I2C_FDR 0x04
+#define MPC_I2C_CR 0x08
+#define MPC_I2C_SR 0x0c
+#define MPC_I2C_DR 0x10
#define MPC_I2C_DFSRR 0x14
#define CCR_MEN 0x80
@@ -58,7 +58,7 @@
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 @@
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)) {
@@ -176,7 +175,7 @@
}
static int mpc_write(struct mpc_i2c *i2c, int target,
- const u8 * data, int length, int restart)
+ const u8 *data, int length, int restart)
{
int i, result;
unsigned timeout = i2c->adap.timeout;
@@ -207,7 +206,7 @@
}
static int mpc_read(struct mpc_i2c *i2c, int target,
- u8 * data, int length, int restart)
+ u8 *data, int length, int restart)
{
unsigned timeout = i2c->adap.timeout;
int i, result;
@@ -311,7 +310,8 @@
.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,11 +341,12 @@
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;
}
}
-
+
mpc_i2c_setclock(i2c);
dev_set_drvdata(&op->dev, i2c);
@@ -368,7 +369,7 @@
free_irq(i2c->irq, i2c);
fail_request:
irq_dispose_mapping(i2c->irq);
- iounmap(i2c->base);
+ iounmap(i2c->base);
fail_map:
kfree(i2c);
return result;
@@ -414,7 +415,7 @@
rv = of_register_platform_driver(&mpc_i2c_driver);
if (rv)
- printk(KERN_ERR DRV_NAME
+ printk(KERN_ERR DRV_NAME
" of_register_platform_driver failed (%i)\n", rv);
return rv;
}
@@ -428,6 +429,6 @@
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");
next prev parent reply other threads:[~2009-04-07 8:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 8:20 [PATCH v3 0/5] i2c: i2c-mpc: make I2C bus speed configurable Wolfgang Grandegger
2009-04-07 8:20 ` Wolfgang Grandegger [this message]
2009-04-07 15:36 ` [PATCH v3 1/5] i2c: i2c-mpc: various coding style fixes Grant Likely
2009-04-07 8:20 ` [PATCH v3 2/5] i2c: i2c-mpc: use dev based printout function Wolfgang Grandegger
2009-04-07 15:37 ` Grant Likely
2009-04-07 8:20 ` [PATCH v3 3/5] i2c: i2c-mpc: make I2C bus speed configurable Wolfgang Grandegger
2009-04-07 15:36 ` Grant Likely
2009-04-07 8:20 ` [PATCH v3 4/5] powerpc: i2c-mpc: document new FSL I2C bindings and cleanup Wolfgang Grandegger
2009-04-07 15:43 ` Grant Likely
2009-04-08 5:13 ` Kumar Gala
2009-04-07 8:20 ` [PATCH v3 5/5] powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board Wolfgang Grandegger
2009-04-07 15:43 ` Grant Likely
2009-04-08 7:16 ` Wolfgang Grandegger
2009-04-08 14:53 ` Grant Likely
2009-04-08 18:27 ` Wolfgang Grandegger
2009-04-08 18:43 ` Kumar Gala
2009-04-08 18:53 ` Wolfgang Grandegger
2009-04-08 5:11 ` [PATCH v3 0/5] i2c: i2c-mpc: make I2C bus speed configurable Kumar Gala
2009-04-08 5:16 ` Grant Likely
2009-04-08 5:22 ` Kumar Gala
2009-04-08 5:32 ` Grant Likely
2009-04-08 7:21 ` Wolfgang Grandegger
2009-04-08 17:03 ` Scott Wood
2009-04-08 17:49 ` Kumar Gala
2009-04-08 5:28 ` Kumar Gala
2009-04-08 7:25 ` Wolfgang Grandegger
2009-04-08 15:21 ` Kumar Gala
2009-04-08 19:55 ` Wolfgang Grandegger
2009-04-09 9:59 ` Wolfgang Grandegger
2009-04-20 9:01 ` Wolfgang Grandegger
2009-04-20 13:26 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090407082231.177941706@denx.de \
--to=wg@grandegger$(echo .)com \
--cc=ben-linux@fluff$(echo .)org \
--cc=devicetree-discuss@ozlabs$(echo .)org \
--cc=linux-i2c@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox