Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: tps65090: Fix bonkers indenting strategy

Browse Source 
First spotted pointless (incorrect) indent of 'if (ret)', then double
indentations of a struct attribute 'mask'.  Decided to go through the
whole file and make amendments instead and this is the result.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Lee Jones 2014-11-10 12:28:36 +00:00
parent 1a5fb99de4
commit 12849b63a4
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/mfd/tps65090.c
View File

@ -76,58 +76,58 @@ static struct mfd_cell tps65090s[] = {
static const struct regmap_irq tps65090_irqs[] = { static const struct regmap_irq tps65090_irqs[] = {
/* INT1 IRQs*/ /* INT1 IRQs*/
[TPS65090_IRQ_VAC_STATUS_CHANGE] = { [TPS65090_IRQ_VAC_STATUS_CHANGE] = {
.mask = TPS65090_INT1_MASK_VAC_STATUS_CHANGE, .mask = TPS65090_INT1_MASK_VAC_STATUS_CHANGE,
}, },
[TPS65090_IRQ_VSYS_STATUS_CHANGE] = { [TPS65090_IRQ_VSYS_STATUS_CHANGE] = {
.mask = TPS65090_INT1_MASK_VSYS_STATUS_CHANGE, .mask = TPS65090_INT1_MASK_VSYS_STATUS_CHANGE,
}, },
[TPS65090_IRQ_BAT_STATUS_CHANGE] = { [TPS65090_IRQ_BAT_STATUS_CHANGE] = {
.mask = TPS65090_INT1_MASK_BAT_STATUS_CHANGE, .mask = TPS65090_INT1_MASK_BAT_STATUS_CHANGE,
}, },
[TPS65090_IRQ_CHARGING_STATUS_CHANGE] = { [TPS65090_IRQ_CHARGING_STATUS_CHANGE] = {
.mask = TPS65090_INT1_MASK_CHARGING_STATUS_CHANGE, .mask = TPS65090_INT1_MASK_CHARGING_STATUS_CHANGE,
}, },
[TPS65090_IRQ_CHARGING_COMPLETE] = { [TPS65090_IRQ_CHARGING_COMPLETE] = {
.mask = TPS65090_INT1_MASK_CHARGING_COMPLETE, .mask = TPS65090_INT1_MASK_CHARGING_COMPLETE,
}, },
[TPS65090_IRQ_OVERLOAD_DCDC1] = { [TPS65090_IRQ_OVERLOAD_DCDC1] = {
.mask = TPS65090_INT1_MASK_OVERLOAD_DCDC1, .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC1,
}, },
[TPS65090_IRQ_OVERLOAD_DCDC2] = { [TPS65090_IRQ_OVERLOAD_DCDC2] = {
.mask = TPS65090_INT1_MASK_OVERLOAD_DCDC2, .mask = TPS65090_INT1_MASK_OVERLOAD_DCDC2,
}, },
/* INT2 IRQs*/ /* INT2 IRQs*/
[TPS65090_IRQ_OVERLOAD_DCDC3] = { [TPS65090_IRQ_OVERLOAD_DCDC3] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_DCDC3, .mask = TPS65090_INT2_MASK_OVERLOAD_DCDC3,
}, },
[TPS65090_IRQ_OVERLOAD_FET1] = { [TPS65090_IRQ_OVERLOAD_FET1] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET1, .mask = TPS65090_INT2_MASK_OVERLOAD_FET1,
}, },
[TPS65090_IRQ_OVERLOAD_FET2] = { [TPS65090_IRQ_OVERLOAD_FET2] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET2, .mask = TPS65090_INT2_MASK_OVERLOAD_FET2,
}, },
[TPS65090_IRQ_OVERLOAD_FET3] = { [TPS65090_IRQ_OVERLOAD_FET3] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET3, .mask = TPS65090_INT2_MASK_OVERLOAD_FET3,
}, },
[TPS65090_IRQ_OVERLOAD_FET4] = { [TPS65090_IRQ_OVERLOAD_FET4] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET4, .mask = TPS65090_INT2_MASK_OVERLOAD_FET4,
}, },
[TPS65090_IRQ_OVERLOAD_FET5] = { [TPS65090_IRQ_OVERLOAD_FET5] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET5, .mask = TPS65090_INT2_MASK_OVERLOAD_FET5,
}, },
[TPS65090_IRQ_OVERLOAD_FET6] = { [TPS65090_IRQ_OVERLOAD_FET6] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET6, .mask = TPS65090_INT2_MASK_OVERLOAD_FET6,
}, },
[TPS65090_IRQ_OVERLOAD_FET7] = { [TPS65090_IRQ_OVERLOAD_FET7] = {
.reg_offset = 1, .reg_offset = 1,
.mask = TPS65090_INT2_MASK_OVERLOAD_FET7, .mask = TPS65090_INT2_MASK_OVERLOAD_FET7,
}, },
}; };
@ -176,7 +176,7 @@ MODULE_DEVICE_TABLE(of, tps65090_of_match);
#endif #endif
static int tps65090_i2c_probe(struct i2c_client *client, static int tps65090_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct tps65090_platform_data *pdata = dev_get_platdata(&client->dev); struct tps65090_platform_data *pdata = dev_get_platdata(&client->dev);
int irq_base = 0; int irq_base = 0;
@ -210,11 +210,11 @@ static int tps65090_i2c_probe(struct i2c_client *client,
if (client->irq) { if (client->irq) {
ret = regmap_add_irq_chip(tps65090->rmap, client->irq, ret = regmap_add_irq_chip(tps65090->rmap, client->irq,
IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base, IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base,
&tps65090_irq_chip, &tps65090->irq_data); &tps65090_irq_chip, &tps65090->irq_data);
if (ret) { if (ret) {
dev_err(&client->dev, dev_err(&client->dev,
"IRQ init failed with err: %d\n", ret); "IRQ init failed with err: %d\n", ret);
return ret; return ret;
} }
} else { } else {
@ -223,8 +223,8 @@ static int tps65090_i2c_probe(struct i2c_client *client,
} }
ret = mfd_add_devices(tps65090->dev, -1, tps65090s, ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
ARRAY_SIZE(tps65090s), NULL, ARRAY_SIZE(tps65090s), NULL,
0, regmap_irq_get_domain(tps65090->irq_data)); 0, regmap_irq_get_domain(tps65090->irq_data));
if (ret) { if (ret) {
dev_err(&client->dev, "add mfd devices failed with err: %d\n", dev_err(&client->dev, "add mfd devices failed with err: %d\n",
ret); ret);