tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: ab8500-gpadc: Squash a whole bunch of Checkpatch warnings and one error

WARNING: line over 80 characters
+#define ADC_CH_IBAT_MIN (-6000) /* mA range measured by ADC for ib
t*/

WARNING: line over 80 characters
+#define ADC_CH_IBAT_MIN_V (-60) /* mV range measured by ADC for ibat*/

WARNING: suspect code indent for conditional statements (16, 20)
+ if (!strcmp(name, dev_name(gpadc->dev)))
+ return gpadc;

WARNING: suspect code indent for conditional statements (0, 16)
+if (ad_value < 0) {
+ dev_err(gpadc->dev, "GPADC raw value failed ch: %d\n",

WARNING: quoted string split across lines
+ dev_err(gpadc->dev, "GPADC to voltage conversion failed ch:"
+ " %d AD: 0x%x\n", channel, ad_value);

WARNING: Missing a blank line after declarations
+ int raw_data;
+ raw_data = ab8500_gpadc_double_read_raw(gpadc, channel,

WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
+ msleep(10);

ERROR: else should follow close brace '}'
+ }
+ else

WARNING: line over 80 characters
+ delay_max = 10000; /* large range to optimise sleep mode */

WARNING: line over 80 characters
+ gpadc->cal_data[ADC_INPUT_IBAT].gain = V_gain * V2A_gain;

WARNING: line over 80 characters
+ gpadc = devm_kzalloc(&pdev->dev, sizeof(struct ab8500_gpadc), GFP_KERNEL);

WARNING: Possible unnecessary 'out of memory' message
+ if (!gpadc) {
+ dev_err(&pdev->dev, "Error: No memory\n");

WARNING: space prohibited before semicolon
+ return ;

WARNING: void function return statements are not generally useful
+ return ;
+}

WARNING: quoted string split across lines
+MODULE_AUTHOR("Arun R Murthy, Daniel Willerud, Johan Palsson,"
+ "M'boumba Cedric Madianga");

total: 1 errors, 14 warnings, 1089 lines checked

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

Lee Jones df36442c de6a7693

+73 -72
+73 -72
drivers/mfd/ab8500-gpadc.c
··· 49 49 * OTP register offsets 50 50 * Bank : 0x15 51 51 */ 52 - #define AB8500_GPADC_CAL_1 0x0F 53 - #define AB8500_GPADC_CAL_2 0x10 54 - #define AB8500_GPADC_CAL_3 0x11 55 - #define AB8500_GPADC_CAL_4 0x12 56 - #define AB8500_GPADC_CAL_5 0x13 57 - #define AB8500_GPADC_CAL_6 0x14 58 - #define AB8500_GPADC_CAL_7 0x15 52 + #define AB8500_GPADC_CAL_1 0x0F 53 + #define AB8500_GPADC_CAL_2 0x10 54 + #define AB8500_GPADC_CAL_3 0x11 55 + #define AB8500_GPADC_CAL_4 0x12 56 + #define AB8500_GPADC_CAL_5 0x13 57 + #define AB8500_GPADC_CAL_6 0x14 58 + #define AB8500_GPADC_CAL_7 0x15 59 59 /* New calibration for 8540 */ 60 60 #define AB8540_GPADC_OTP4_REG_7 0x38 61 61 #define AB8540_GPADC_OTP4_REG_6 0x39 62 62 #define AB8540_GPADC_OTP4_REG_5 0x3A 63 63 64 64 /* gpadc constants */ 65 - #define EN_VINTCORE12 0x04 66 - #define EN_VTVOUT 0x02 67 - #define EN_GPADC 0x01 68 - #define DIS_GPADC 0x00 69 - #define AVG_1 0x00 70 - #define AVG_4 0x20 71 - #define AVG_8 0x40 72 - #define AVG_16 0x60 73 - #define ADC_SW_CONV 0x04 74 - #define EN_ICHAR 0x80 75 - #define BTEMP_PULL_UP 0x08 76 - #define EN_BUF 0x40 77 - #define DIS_ZERO 0x00 78 - #define GPADC_BUSY 0x01 79 - #define EN_FALLING 0x10 80 - #define EN_TRIG_EDGE 0x02 81 - #define EN_VBIAS_XTAL_TEMP 0x02 65 + #define EN_VINTCORE12 0x04 66 + #define EN_VTVOUT 0x02 67 + #define EN_GPADC 0x01 68 + #define DIS_GPADC 0x00 69 + #define AVG_1 0x00 70 + #define AVG_4 0x20 71 + #define AVG_8 0x40 72 + #define AVG_16 0x60 73 + #define ADC_SW_CONV 0x04 74 + #define EN_ICHAR 0x80 75 + #define BTEMP_PULL_UP 0x08 76 + #define EN_BUF 0x40 77 + #define DIS_ZERO 0x00 78 + #define GPADC_BUSY 0x01 79 + #define EN_FALLING 0x10 80 + #define EN_TRIG_EDGE 0x02 81 + #define EN_VBIAS_XTAL_TEMP 0x02 82 82 83 83 /* GPADC constants from AB8500 spec, UM0836 */ 84 - #define ADC_RESOLUTION 1024 85 - #define ADC_CH_BTEMP_MIN 0 86 - #define ADC_CH_BTEMP_MAX 1350 87 - #define ADC_CH_DIETEMP_MIN 0 88 - #define ADC_CH_DIETEMP_MAX 1350 89 - #define ADC_CH_CHG_V_MIN 0 90 - #define ADC_CH_CHG_V_MAX 20030 91 - #define ADC_CH_ACCDET2_MIN 0 92 - #define ADC_CH_ACCDET2_MAX 2500 93 - #define ADC_CH_VBAT_MIN 2300 94 - #define ADC_CH_VBAT_MAX 4800 95 - #define ADC_CH_CHG_I_MIN 0 96 - #define ADC_CH_CHG_I_MAX 1500 97 - #define ADC_CH_BKBAT_MIN 0 98 - #define ADC_CH_BKBAT_MAX 3200 84 + #define ADC_RESOLUTION 1024 85 + #define ADC_CH_BTEMP_MIN 0 86 + #define ADC_CH_BTEMP_MAX 1350 87 + #define ADC_CH_DIETEMP_MIN 0 88 + #define ADC_CH_DIETEMP_MAX 1350 89 + #define ADC_CH_CHG_V_MIN 0 90 + #define ADC_CH_CHG_V_MAX 20030 91 + #define ADC_CH_ACCDET2_MIN 0 92 + #define ADC_CH_ACCDET2_MAX 2500 93 + #define ADC_CH_VBAT_MIN 2300 94 + #define ADC_CH_VBAT_MAX 4800 95 + #define ADC_CH_CHG_I_MIN 0 96 + #define ADC_CH_CHG_I_MAX 1500 97 + #define ADC_CH_BKBAT_MIN 0 98 + #define ADC_CH_BKBAT_MAX 3200 99 99 100 100 /* GPADC constants from AB8540 spec */ 101 - #define ADC_CH_IBAT_MIN (-6000) /* mA range measured by ADC for ibat*/ 102 - #define ADC_CH_IBAT_MAX 6000 103 - #define ADC_CH_IBAT_MIN_V (-60) /* mV range measured by ADC for ibat*/ 104 - #define ADC_CH_IBAT_MAX_V 60 105 - #define IBAT_VDROP_L (-56) /* mV */ 106 - #define IBAT_VDROP_H 56 101 + #define ADC_CH_IBAT_MIN (-6000) /* mA range measured by ADC for ibat */ 102 + #define ADC_CH_IBAT_MAX 6000 103 + #define ADC_CH_IBAT_MIN_V (-60) /* mV range measured by ADC for ibat */ 104 + #define ADC_CH_IBAT_MAX_V 60 105 + #define IBAT_VDROP_L (-56) /* mV */ 106 + #define IBAT_VDROP_H 56 107 107 108 108 /* This is used to not lose precision when dividing to get gain and offset */ 109 109 #define CALIB_SCALE 1000 ··· 179 179 180 180 list_for_each_entry(gpadc, &ab8500_gpadc_list, node) { 181 181 if (!strcmp(name, dev_name(gpadc->dev))) 182 - return gpadc; 182 + return gpadc; 183 183 } 184 184 185 185 return ERR_PTR(-ENOENT); ··· 315 315 316 316 ad_value = ab8500_gpadc_read_raw(gpadc, channel, avg_sample, 317 317 trig_edge, trig_timer, conv_type); 318 - /* On failure retry a second time */ 318 + 319 + /* On failure retry a second time */ 319 320 if (ad_value < 0) 320 321 ad_value = ab8500_gpadc_read_raw(gpadc, channel, avg_sample, 321 322 trig_edge, trig_timer, conv_type); 322 - if (ad_value < 0) { 323 + if (ad_value < 0) { 323 324 dev_err(gpadc->dev, "GPADC raw value failed ch: %d\n", 324 325 channel); 325 326 return ad_value; ··· 328 327 329 328 voltage = ab8500_gpadc_ad_to_voltage(gpadc, channel, ad_value); 330 329 if (voltage < 0) 331 - dev_err(gpadc->dev, "GPADC to voltage conversion failed ch:" 332 - " %d AD: 0x%x\n", channel, ad_value); 330 + dev_err(gpadc->dev, 331 + "GPADC to voltage conversion failed ch: %d AD: 0x%x\n", 332 + channel, ad_value); 333 333 334 334 return voltage; 335 335 } ··· 350 348 int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel, 351 349 u8 avg_sample, u8 trig_edge, u8 trig_timer, u8 conv_type) 352 350 { 353 - int raw_data; 354 - raw_data = ab8500_gpadc_double_read_raw(gpadc, channel, 355 - avg_sample, trig_edge, trig_timer, conv_type, NULL); 356 - return raw_data; 351 + return ab8500_gpadc_double_read_raw(gpadc, channel, avg_sample, 352 + trig_edge, trig_timer, conv_type, 353 + NULL); 357 354 } 358 355 359 356 int ab8500_gpadc_double_read_raw(struct ab8500_gpadc *gpadc, u8 channel, ··· 389 388 goto out; 390 389 if (!(val & GPADC_BUSY)) 391 390 break; 392 - msleep(10); 391 + msleep(20); 393 392 } while (++looplimit < 10); 394 393 if (looplimit >= 10 && (val & GPADC_BUSY)) { 395 394 dev_err(gpadc->dev, "gpadc_conversion: GPADC busy"); ··· 422 421 val_reg1 |= EN_TRIG_EDGE; 423 422 if (trig_edge) 424 423 val_reg1 |= EN_FALLING; 425 - } 426 - else 424 + } else 427 425 ret = abx500_set_register_interruptible(gpadc->dev, 428 426 AB8500_GPADC, AB8500_GPADC_CTRL2_REG, val); 429 427 if (ret < 0) { ··· 449 449 * remove when hardware will be availible 450 450 */ 451 451 delay_min = 1000; /* Delay in micro seconds */ 452 - delay_max = 10000; /* large range to optimise sleep mode */ 452 + delay_max = 10000; /* large range optimises sleepmode */ 453 453 break; 454 454 } 455 455 /* Intentional fallthrough */ ··· 785 785 << CALIB_SHIFT_IBAT) 786 786 / (ADC_CH_IBAT_MAX_V - ADC_CH_IBAT_MIN_V); 787 787 788 - gpadc->cal_data[ADC_INPUT_IBAT].gain = V_gain * V2A_gain; 789 - gpadc->cal_data[ADC_INPUT_IBAT].offset = V_offset * 790 - V2A_gain + V2A_offset; 788 + gpadc->cal_data[ADC_INPUT_IBAT].gain = 789 + V_gain * V2A_gain; 790 + gpadc->cal_data[ADC_INPUT_IBAT].offset = 791 + V_offset * V2A_gain + V2A_offset; 791 792 } else { 792 793 gpadc->cal_data[ADC_INPUT_IBAT].gain = 0; 793 794 } ··· 924 923 int ret = 0; 925 924 struct ab8500_gpadc *gpadc; 926 925 927 - gpadc = devm_kzalloc(&pdev->dev, sizeof(struct ab8500_gpadc), GFP_KERNEL); 928 - if (!gpadc) { 929 - dev_err(&pdev->dev, "Error: No memory\n"); 926 + gpadc = devm_kzalloc(&pdev->dev, 927 + sizeof(struct ab8500_gpadc), GFP_KERNEL); 928 + if (!gpadc) 930 929 return -ENOMEM; 931 - } 932 930 933 931 gpadc->irq_sw = platform_get_irq_byname(pdev, "SW_CONV_END"); 934 932 if (gpadc->irq_sw < 0) ··· 1072 1072 *vmain_h = gpadc->cal_data[ADC_INPUT_VMAIN].otp_calib_hi; 1073 1073 *btemp_l = gpadc->cal_data[ADC_INPUT_BTEMP].otp_calib_lo; 1074 1074 *btemp_h = gpadc->cal_data[ADC_INPUT_BTEMP].otp_calib_hi; 1075 - *vbat_l = gpadc->cal_data[ADC_INPUT_VBAT].otp_calib_lo; 1076 - *vbat_h = gpadc->cal_data[ADC_INPUT_VBAT].otp_calib_hi; 1077 - *ibat_l = gpadc->cal_data[ADC_INPUT_IBAT].otp_calib_lo; 1078 - *ibat_h = gpadc->cal_data[ADC_INPUT_IBAT].otp_calib_hi; 1079 - return ; 1075 + *vbat_l = gpadc->cal_data[ADC_INPUT_VBAT].otp_calib_lo; 1076 + *vbat_h = gpadc->cal_data[ADC_INPUT_VBAT].otp_calib_hi; 1077 + *ibat_l = gpadc->cal_data[ADC_INPUT_IBAT].otp_calib_lo; 1078 + *ibat_h = gpadc->cal_data[ADC_INPUT_IBAT].otp_calib_hi; 1080 1079 } 1081 1080 1082 1081 subsys_initcall_sync(ab8500_gpadc_init); 1083 1082 module_exit(ab8500_gpadc_exit); 1084 1083 1085 1084 MODULE_LICENSE("GPL v2"); 1086 - MODULE_AUTHOR("Arun R Murthy, Daniel Willerud, Johan Palsson," 1087 - "M'boumba Cedric Madianga"); 1085 + MODULE_AUTHOR("Arun R Murthy"); 1086 + MODULE_AUTHOR("Daniel Willerud"); 1087 + MODULE_AUTHOR("Johan Palsson"); 1088 + MODULE_AUTHOR("M'boumba Cedric Madianga"); 1088 1089 MODULE_ALIAS("platform:ab8500_gpadc"); 1089 1090 MODULE_DESCRIPTION("AB8500 GPADC driver");