openwrtv4/target/linux/s3c24xx/patches-2.6.24/1218-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch

78 lines
3 KiB
Diff
Raw Normal View History

From b496d7ecfb1964a508f4aa2dfb8b27099e7777fc Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Wed, 2 Jul 2008 22:44:49 +0100
Subject: [PATCH] From 000450f1ad2c713d2345a872fdf44f5dd3702e1b Mon Sep 17 00:00:00 2001
Subject: [PATCH] [janitor] make checkpatch.pl happy
---
drivers/i2c/chips/pcf50606.c | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
index aa841e3..ddba1c7 100644
--- a/drivers/i2c/chips/pcf50606.c
+++ b/drivers/i2c/chips/pcf50606.c
@@ -79,12 +79,12 @@ I2C_CLIENT_INSMOD_1(pcf50606);
#define PCF50606_B_CHG_PROT 4 /* Charger Protection */
#define PCF50606_B_CHG_READY 5 /* Charging completed */
-#define PCF50606_F_CHG_FAST (1<<PCF50606_B_CHG_FAST) /* Charger Fast allowed */
-#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT) /* Charger present */
-#define PCF50606_F_CHG_FOK (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
-#define PCF50606_F_CHG_ERR (1<<PCF50606_B_CHG_ERR) /* Charger Error */
-#define PCF50606_F_CHG_PROT (1<<PCF50606_B_CHG_PROT) /* Charger Protection */
-#define PCF50606_F_CHG_READY (1<<PCF50606_B_CHG_READY) /* Charging completed */
+#define PCF50606_F_CHG_FAST (1<<PCF50606_B_CHG_FAST)
+#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT)
+#define PCF50606_F_CHG_FOK (1<<PCF50606_B_CHG_FOK)
+#define PCF50606_F_CHG_ERR (1<<PCF50606_B_CHG_ERR)
+#define PCF50606_F_CHG_PROT (1<<PCF50606_B_CHG_PROT)
+#define PCF50606_F_CHG_READY (1<<PCF50606_B_CHG_READY)
#define PCF50606_F_CHG_MASK 0x000000fc
#define PCF50606_F_PWR_PRESSED 0x00000100
@@ -598,7 +598,8 @@ static void pcf50606_work(struct work_struct *work)
pcf->flags |= PCF50606_F_CHG_PRESENT;
if (pcf->pdata->cb)
pcf->pdata->cb(&pcf->client.dev,
- PCF50606_FEAT_MBC, PMU_EVT_INSERT);
+ PCF50606_FEAT_MBC,
+ PMU_EVT_INSERT);
}
pcf->coldplug_done = 1;
@@ -988,7 +989,8 @@ EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
{
- u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
+ u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt)
+ / (1023 - adc);
return r_ntc;
}
@@ -1290,8 +1292,9 @@ static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
struct pcf50606_time pcf_tm;
mutex_lock(&pcf->lock);
- alrm->enabled =
- __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
+ alrm->enabled =
+ __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM
+ ? 0 : 1;
pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
@@ -1665,7 +1668,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
return -ENOMEM;
mutex_init(&data->lock);
- mutex_init(&data->working_lock);
+ mutex_init(&data->working_lock);
INIT_WORK(&data->work, pcf50606_work);
data->irq = irq;
data->working = 0;
--
1.5.6.5