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

   1 From b496d7ecfb1964a508f4aa2dfb8b27099e7777fc Mon Sep 17 00:00:00 2001
   2 From: Holger Freyther <zecke@openmoko.org>
   3 Date: Wed, 2 Jul 2008 22:44:49 +0100
   4 Subject: [PATCH] From 000450f1ad2c713d2345a872fdf44f5dd3702e1b Mon Sep 17 00:00:00 2001
   5  Subject: [PATCH] [janitor] make checkpatch.pl happy
   6
   7 ---
   8  drivers/i2c/chips/pcf50606.c |   25 ++++++++++++++-----------
   9  1 files changed, 14 insertions(+), 11 deletions(-)
  10
  11 diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
  12 index aa841e3..ddba1c7 100644
  13 --- a/drivers/i2c/chips/pcf50606.c
  14 +++ b/drivers/i2c/chips/pcf50606.c
  15 @@ -79,12 +79,12 @@ I2C_CLIENT_INSMOD_1(pcf50606);
  16  #define PCF50606_B_CHG_PROT    4       /* Charger Protection */
  17  #define PCF50606_B_CHG_READY   5       /* Charging completed */
  18
  19 -#define PCF50606_F_CHG_FAST    (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
  20 -#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
  21 -#define PCF50606_F_CHG_FOK     (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
  22 -#define PCF50606_F_CHG_ERR     (1<<PCF50606_B_CHG_ERR) /* Charger Error */
  23 -#define PCF50606_F_CHG_PROT    (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
  24 -#define PCF50606_F_CHG_READY   (1<<PCF50606_B_CHG_READY)       /* Charging completed */
  25 +#define PCF50606_F_CHG_FAST    (1<<PCF50606_B_CHG_FAST)
  26 +#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT)
  27 +#define PCF50606_F_CHG_FOK     (1<<PCF50606_B_CHG_FOK)
  28 +#define PCF50606_F_CHG_ERR     (1<<PCF50606_B_CHG_ERR)
  29 +#define PCF50606_F_CHG_PROT    (1<<PCF50606_B_CHG_PROT)
  30 +#define PCF50606_F_CHG_READY   (1<<PCF50606_B_CHG_READY)
  31  #define PCF50606_F_CHG_MASK    0x000000fc
  32
  33  #define PCF50606_F_PWR_PRESSED 0x00000100
  34 @@ -598,7 +598,8 @@ static void pcf50606_work(struct work_struct *work)
  35                         pcf->flags |= PCF50606_F_CHG_PRESENT;
  36                         if (pcf->pdata->cb)
  37                                 pcf->pdata->cb(&pcf->client.dev,
  38 -                                       PCF50606_FEAT_MBC, PMU_EVT_INSERT);
  39 +                                               PCF50606_FEAT_MBC,
  40 +                                               PMU_EVT_INSERT);
  41                 }
  42
  43                 pcf->coldplug_done = 1;
  44 @@ -988,7 +989,8 @@ EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
  45
  46  static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
  47  {
  48 -       u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
  49 +       u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt)
  50 +               / (1023 - adc);
  51
  52         return r_ntc;
  53  }
  54 @@ -1290,8 +1292,9 @@ static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
  55         struct pcf50606_time pcf_tm;
  56
  57         mutex_lock(&pcf->lock);
  58 -       alrm->enabled =
  59 -             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
  60 +       alrm->enabled =
  61 +               __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM
  62 +               ? 0 : 1;
  63         pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
  64         pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
  65         pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
  66 @@ -1665,7 +1668,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
  67                 return -ENOMEM;
  68
  69         mutex_init(&data->lock);
  70 -       mutex_init(&data->working_lock);
  71 +       mutex_init(&data->working_lock);
  72         INIT_WORK(&data->work, pcf50606_work);
  73         data->irq = irq;
  74         data->working = 0;
  75 --
  76 1.5.6.5
  77