From 9186cc366b038bebb4c1507284f5356067ffb44c Mon Sep 17 00:00:00 2001 From: Marcus Cooper Date: Wed, 28 Nov 2012 14:42:59 +0100 Subject: [PATCH] --- yaml --- r: 367487 b: refs/heads/master c: 7a2cf9bacf6c5f3119a9100f103dc46a1f648fbb h: refs/heads/master i: 367485: 7658e459bfea8405a2483d6eb3343f7ee057816c 367483: 07db4ec997af5efd3cc9cbb75d90e717a5f9531d 367479: 3b7013695b18e1a82091174ac21d7e77c5768b60 367471: a0e2535835d4d6032ede0f78473cfb4723e10403 367455: ad732e7e434bb49d9fc43f1c989308ebe8144b72 367423: 2a2e1323aa111df4eec8398a8d251ac324bde548 367359: 066e864ffe6e10d17f059b387bd3fa4855c38273 v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_btemp.c | 4 ++-- trunk/drivers/power/ab8500_fg.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eaa7b2f2975e..72a9ae5e6558 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f80ba63187439ef4ad3810ccd97633af9522be8 +refs/heads/master: 7a2cf9bacf6c5f3119a9100f103dc46a1f648fbb diff --git a/trunk/drivers/power/ab8500_btemp.c b/trunk/drivers/power/ab8500_btemp.c index 7336dcf45f7e..a9486f1a1b5b 100644 --- a/trunk/drivers/power/ab8500_btemp.c +++ b/trunk/drivers/power/ab8500_btemp.c @@ -158,7 +158,7 @@ static int ab8500_btemp_batctrl_volt_to_res(struct ab8500_btemp *di, if (di->bm->adc_therm == ABx500_ADC_THERM_BATCTRL) { /* * If the battery has internal NTC, we use the current - * source to calculate the resistance, 7uA or 20uA + * source to calculate the resistance. */ rbs = (v_batctrl * 1000 - di->bm->gnd_lift_resistance * inst_curr) @@ -602,7 +602,7 @@ static int ab8500_btemp_id(struct ab8500_btemp *di) /* * We only have to change current source if the - * detected type is Type 1, else we use the 7uA source + * detected type is Type 1. */ if (di->bm->adc_therm == ABx500_ADC_THERM_BATCTRL && di->bm->batt_id == 1) { diff --git a/trunk/drivers/power/ab8500_fg.c b/trunk/drivers/power/ab8500_fg.c index 466ec6292d73..adc02004e7a3 100644 --- a/trunk/drivers/power/ab8500_fg.c +++ b/trunk/drivers/power/ab8500_fg.c @@ -1979,7 +1979,7 @@ static void ab8500_fg_instant_work(struct work_struct *work) } /** - * ab8500_fg_cc_data_end_handler() - isr to get battery avg current. + * ab8500_fg_cc_data_end_handler() - end of data conversion isr. * @irq: interrupt number * @_di: pointer to the ab8500_fg structure * @@ -1999,7 +1999,7 @@ static irqreturn_t ab8500_fg_cc_data_end_handler(int irq, void *_di) } /** - * ab8500_fg_cc_convend_handler() - isr to get battery avg current. + * ab8500_fg_cc_int_calib_handler () - end of calibration isr. * @irq: interrupt number * @_di: pointer to the ab8500_fg structure *