mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

mfd: arizona: Fixup some formatting/white space errors

Browse source 
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>
This commit is contained in:
Charles Keepax 2015-08-11 09:34:31 +01:00 committed by Lee Jones
parent dd30acc889
commit 3762aede11
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/mfd/arizona-core.c
View file

@ -30,7 +30,7 @@
#include "arizona.h" #include "arizona.h"
static const char *wm5102_core_supplies[] = { static const char * const wm5102_core_supplies[] = {
"AVDD", "AVDD",
"DBVDD1", "DBVDD1",
}; };
@ -148,7 +148,7 @@ static irqreturn_t arizona_overclocked(int irq, void *data)
struct arizona *arizona = data; struct arizona *arizona = data;
unsigned int val[3]; unsigned int val[3];
int ret; int ret;
ret = regmap_bulk_read(arizona->regmap, ARIZONA_INTERRUPT_RAW_STATUS_6, ret = regmap_bulk_read(arizona->regmap, ARIZONA_INTERRUPT_RAW_STATUS_6,
&val[0], 3); &val[0], 3);
if (ret != 0) { if (ret != 0) {
@ -567,9 +567,8 @@ static int arizona_runtime_resume(struct device *dev)
break; break;
default: default:
ret = arizona_wait_for_boot(arizona); ret = arizona_wait_for_boot(arizona);
if (ret != 0) { if (ret != 0)
goto err; goto err;
}
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap, ret = regmap_update_bits(arizona->regmap,
@ -776,8 +775,8 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
ret = of_property_read_u32_array(arizona->dev->of_node, ret = of_property_read_u32_array(arizona->dev->of_node,
"wlf,gpio-defaults", "wlf,gpio-defaults",
arizona->pdata.gpio_defaults, pdata->gpio_defaults,
ARRAY_SIZE(arizona->pdata.gpio_defaults)); ARRAY_SIZE(pdata->gpio_defaults));
if (ret >= 0) { if (ret >= 0) {
/* /*
* All values are literal except out of range values * All values are literal except out of range values
@ -785,11 +784,11 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
* data which uses 0 as chip default and out of range * data which uses 0 as chip default and out of range
* as zero. * as zero.
*/ */
for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) { for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) {
if (arizona->pdata.gpio_defaults[i] > 0xffff) if (pdata->gpio_defaults[i] > 0xffff)
arizona->pdata.gpio_defaults[i] = 0; pdata->gpio_defaults[i] = 0;
else if (arizona->pdata.gpio_defaults[i] == 0) else if (pdata->gpio_defaults[i] == 0)
arizona->pdata.gpio_defaults[i] = 0x10000; pdata->gpio_defaults[i] = 0x10000;
} }
} else { } else {
dev_err(arizona->dev, "Failed to parse GPIO defaults: %d\n", dev_err(arizona->dev, "Failed to parse GPIO defaults: %d\n",
@ -798,20 +797,20 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
of_property_for_each_u32(arizona->dev->of_node, "wlf,inmode", prop, of_property_for_each_u32(arizona->dev->of_node, "wlf,inmode", prop,
cur, val) { cur, val) {
if (count == ARRAY_SIZE(arizona->pdata.inmode)) if (count == ARRAY_SIZE(pdata->inmode))
break; break;
arizona->pdata.inmode[count] = val; pdata->inmode[count] = val;
count++; count++;
} }
count = 0; count = 0;
of_property_for_each_u32(arizona->dev->of_node, "wlf,dmic-ref", prop, of_property_for_each_u32(arizona->dev->of_node, "wlf,dmic-ref", prop,
cur, val) { cur, val) {
if (count == ARRAY_SIZE(arizona->pdata.dmic_ref)) if (count == ARRAY_SIZE(pdata->dmic_ref))
break; break;
arizona->pdata.dmic_ref[count] = val; pdata->dmic_ref[count] = val;
count++; count++;
} }
@ -839,7 +838,7 @@ static const struct mfd_cell early_devs[] = {
{ .name = "arizona-ldo1" }, { .name = "arizona-ldo1" },
}; };
static const char *wm5102_supplies[] = { static const char * const wm5102_supplies[] = {
"MICVDD", "MICVDD",
"DBVDD2", "DBVDD2",
"DBVDD3", "DBVDD3",
@ -882,7 +881,7 @@ static const struct mfd_cell wm5110_devs[] = {
}, },
}; };
static const char *wm8997_supplies[] = { static const char * const wm8997_supplies[] = {
"MICVDD", "MICVDD",
"DBVDD2", "DBVDD2",
"CPVDD", "CPVDD",