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

mfd: arizona: Fixup some formatting/white space errors

Clear out a few checkpatch warnings and white space errors.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Charles Keepax and committed by
Lee Jones
3762aede dd30acc8

+16 -17
+16 -17
drivers/mfd/arizona-core.c
··· 30 30 31 31 #include "arizona.h" 32 32 33 - static const char *wm5102_core_supplies[] = { 33 + static const char * const wm5102_core_supplies[] = { 34 34 "AVDD", 35 35 "DBVDD1", 36 36 }; ··· 148 148 struct arizona *arizona = data; 149 149 unsigned int val[3]; 150 150 int ret; 151 - 151 + 152 152 ret = regmap_bulk_read(arizona->regmap, ARIZONA_INTERRUPT_RAW_STATUS_6, 153 153 &val[0], 3); 154 154 if (ret != 0) { ··· 567 567 break; 568 568 default: 569 569 ret = arizona_wait_for_boot(arizona); 570 - if (ret != 0) { 570 + if (ret != 0) 571 571 goto err; 572 - } 573 572 574 573 if (arizona->external_dcvdd) { 575 574 ret = regmap_update_bits(arizona->regmap, ··· 775 776 776 777 ret = of_property_read_u32_array(arizona->dev->of_node, 777 778 "wlf,gpio-defaults", 778 - arizona->pdata.gpio_defaults, 779 - ARRAY_SIZE(arizona->pdata.gpio_defaults)); 779 + pdata->gpio_defaults, 780 + ARRAY_SIZE(pdata->gpio_defaults)); 780 781 if (ret >= 0) { 781 782 /* 782 783 * All values are literal except out of range values ··· 784 785 * data which uses 0 as chip default and out of range 785 786 * as zero. 786 787 */ 787 - for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) { 788 - if (arizona->pdata.gpio_defaults[i] > 0xffff) 789 - arizona->pdata.gpio_defaults[i] = 0; 790 - else if (arizona->pdata.gpio_defaults[i] == 0) 791 - arizona->pdata.gpio_defaults[i] = 0x10000; 788 + for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) { 789 + if (pdata->gpio_defaults[i] > 0xffff) 790 + pdata->gpio_defaults[i] = 0; 791 + else if (pdata->gpio_defaults[i] == 0) 792 + pdata->gpio_defaults[i] = 0x10000; 792 793 } 793 794 } else { 794 795 dev_err(arizona->dev, "Failed to parse GPIO defaults: %d\n", ··· 797 798 798 799 of_property_for_each_u32(arizona->dev->of_node, "wlf,inmode", prop, 799 800 cur, val) { 800 - if (count == ARRAY_SIZE(arizona->pdata.inmode)) 801 + if (count == ARRAY_SIZE(pdata->inmode)) 801 802 break; 802 803 803 - arizona->pdata.inmode[count] = val; 804 + pdata->inmode[count] = val; 804 805 count++; 805 806 } 806 807 807 808 count = 0; 808 809 of_property_for_each_u32(arizona->dev->of_node, "wlf,dmic-ref", prop, 809 810 cur, val) { 810 - if (count == ARRAY_SIZE(arizona->pdata.dmic_ref)) 811 + if (count == ARRAY_SIZE(pdata->dmic_ref)) 811 812 break; 812 813 813 - arizona->pdata.dmic_ref[count] = val; 814 + pdata->dmic_ref[count] = val; 814 815 count++; 815 816 } 816 817 ··· 838 839 { .name = "arizona-ldo1" }, 839 840 }; 840 841 841 - static const char *wm5102_supplies[] = { 842 + static const char * const wm5102_supplies[] = { 842 843 "MICVDD", 843 844 "DBVDD2", 844 845 "DBVDD3", ··· 881 882 }, 882 883 }; 883 884 884 - static const char *wm8997_supplies[] = { 885 + static const char * const wm8997_supplies[] = { 885 886 "MICVDD", 886 887 "DBVDD2", 887 888 "CPVDD",