From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>,
Balaji Rao <balajirrao@openmoko.org>
Subject: [PATCH 5/5] mfd: pcf50633 - whitespace and formatting fixes
Date: Sun, 15 Nov 2009 22:09:05 -0800 [thread overview]
Message-ID: <20091116060905.20162.50460.stgit@localhost.localdomain> (raw)
In-Reply-To: <20091116060611.20162.81714.stgit@localhost.localdomain>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/mfd/pcf50633-core.c | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 2126563..f3203bd 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -2,7 +2,7 @@
*
* (C) 2006-2008 by Openmoko, Inc.
* Author: Harald Welte <laforge@openmoko.org>
- * Balaji Rao <balajirrao@openmoko.org>
+ * Balaji Rao <balajirrao@openmoko.org>
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
/* Two MBCS registers used during cold start */
#define PCF50633_REG_MBCS1 0x4b
#define PCF50633_REG_MBCS2 0x4c
-#define PCF50633_MBCS1_USBPRES 0x01
+#define PCF50633_MBCS1_USBPRES 0x01
#define PCF50633_MBCS1_ADAPTPRES 0x01
static int __pcf50633_read(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
@@ -53,7 +53,6 @@ static int __pcf50633_write(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
dev_err(pcf->dev, "Error writing %d regs at %d\n", num, reg);
return ret;
-
}
/* Read a block of upto 32 regs */
@@ -348,8 +347,10 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
/* defeat 8s death from lowsys on A5 */
pcf50633_reg_write(pcf, PCF50633_REG_OOCSHDWN, 0x04);
- /* We immediately read the usb and adapter status. We thus make sure
- * only of USBINS/USBREM IRQ handlers are called */
+ /*
+ * We immediately read the usb and adapter status. We thus make sure
+ * only of USBINS/USBREM IRQ handlers are called.
+ */
if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
if (chgstat & (0x3 << 4))
@@ -367,12 +368,14 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
pcf_int[0] &= ~(1 << PCF50633_INT1_ADPINS);
}
- dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x "
- "INT4=0x%02x INT5=0x%02x\n", pcf_int[0],
- pcf_int[1], pcf_int[2], pcf_int[3], pcf_int[4]);
+ dev_dbg(pcf->dev,
+ "INT1=0x%02x INT2=0x%02x INT3=0x%02x INT4=0x%02x INT5=0x%02x\n",
+ pcf_int[0], pcf_int[1], pcf_int[2], pcf_int[3], pcf_int[4]);
- /* Some revisions of the chip don't have a 8s standby mode on
- * ONKEY1S press. We try to manually do it in such cases. */
+ /*
+ * Some revisions of the chip don't have a 8s standby mode on
+ * ONKEY1S press. We try to manually do it in such cases.
+ */
if ((pcf_int[0] & PCF50633_INT1_SECOND) && pcf->onkey1s_held) {
dev_info(pcf->dev, "ONKEY1S held for %d secs\n",
pcf->onkey1s_held);
@@ -665,8 +668,10 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
}
if (enable_irq_wake(client->irq) < 0)
- dev_err(pcf->dev, "IRQ %u cannot be enabled as wake-up source"
- "in this hardware revision", client->irq);
+ dev_err(pcf->dev,
+ "IRQ %u cannot be enabled as wake-up source "
+ "in this hardware revision\n",
+ client->irq);
error = sysfs_create_group(&client->dev.kobj, &pcf_attr_group);
if (error) {
next prev parent reply other threads:[~2009-11-16 6:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 6:08 [PATCH 0/5] pcf50633 - error handling & use threaded IRQs - v2 Dmitry Torokhov
2009-11-16 6:08 ` [PATCH 1/5] mfd: pcf50633 - make 'is_suspended' a bool Dmitry Torokhov
2009-11-16 6:08 ` [PATCH 2/5] mfd: pcf50633 - use threaded interrupts Dmitry Torokhov
2009-11-16 6:08 ` [PATCH 3/5] mfd: pcf50633 - move creating of regulator devices out of line Dmitry Torokhov
2009-11-16 6:08 ` [PATCH 4/5] mfd: pcf50633 - fix error handling during probe Dmitry Torokhov
2009-11-16 6:09 ` Dmitry Torokhov [this message]
2009-11-20 9:45 ` [PATCH 0/5] pcf50633 - error handling & use threaded IRQs - v2 Samuel Ortiz
2010-05-07 21:38 ` Lars-Peter Clausen
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=20091116060905.20162.50460.stgit@localhost.localdomain \
--to=dmitry.torokhov@gmail.com \
--cc=balajirrao@openmoko.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.