Skip to content

Commit 7ccf40b

Browse files
author
Lee Jones
committed
mfd: ab8500-core: Resolve code style issues
Soothes the following checkpatch warnings: WARNING: line over 80 characters #151: FILE: drivers/mfd/ab8500-core.c:151: + 0, 1, 2, 3, 4, -1, -1, -1, -1, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22, 23, ERROR: spaces required around that '=' (ctx:VxW) #325: FILE: drivers/mfd/ab8500-core.c:325: + ret= mask_and_set_register_interruptible(ab8500, bank, reg, ^ WARNING: line over 80 characters #418: FILE: drivers/mfd/ab8500-core.c:418: + else if (offset >= AB9540_INT_GPIO50R && offset <= AB9540_INT_GPIO54R) WARNING: line over 80 characters #420: FILE: drivers/mfd/ab8500-core.c:420: + else if (offset == AB8540_INT_GPIO43R || offset == AB8540_INT_GPIO44R) ERROR: spaces required around that '==' (ctx:VxV) #454: FILE: drivers/mfd/ab8500-core.c:454: + if ((i==3) && (*offset >= 24)) ^ ERROR: code indent should use tabs where possible #576: FILE: drivers/mfd/ab8500-core.c:576: + .map = ab8500_irq_map,$ WARNING: please, no spaces at the start of a line #576: FILE: drivers/mfd/ab8500-core.c:576: + .map = ab8500_irq_map,$ ERROR: code indent should use tabs where possible #577: FILE: drivers/mfd/ab8500-core.c:577: + .xlate = irq_domain_xlate_twocell,$ WARNING: please, no spaces at the start of a line #577: FILE: drivers/mfd/ab8500-core.c:577: + .xlate = irq_domain_xlate_twocell,$ WARNING: char * array declaration might be better as static const #1554: FILE: drivers/mfd/ab8500-core.c:1554: + static char *switch_off_status[] = { WARNING: char * array declaration might be better as static const #1563: FILE: drivers/mfd/ab8500-core.c:1563: + static char *turn_on_status[] = { WARNING: sizeof *ab8500 should be sizeof(*ab8500) #1582: FILE: drivers/mfd/ab8500-core.c:1582: + ab8500 = devm_kzalloc(&pdev->dev, sizeof *ab8500, GFP_KERNEL); ERROR: space required after that close brace '}' #1639: FILE: drivers/mfd/ab8500-core.c:1639: + }/* Configure AB8500 or AB9540 IRQ */ WARNING: line over 80 characters #1652: FILE: drivers/mfd/ab8500-core.c:1652: + ab8500->oldmask = devm_kzalloc(&pdev->dev, ab8500->mask_size, GFP_KERNEL); WARNING: Prefer [subsystem eg: netdev]_cont([subsystem]dev, ... then dev_cont(dev, ... then pr_cont(... to printk(KERN_CONT ... #1677: FILE: drivers/mfd/ab8500-core.c:1677: + printk(KERN_CONT " \"%s\"", WARNING: Prefer [subsystem eg: netdev]_cont([subsystem]dev, ... then dev_cont(dev, ... then pr_cont(... to printk(KERN_CONT ... #1682: FILE: drivers/mfd/ab8500-core.c:1682: + printk(KERN_CONT "\n"); WARNING: Prefer [subsystem eg: netdev]_cont([subsystem]dev, ... then dev_cont(dev, ... then pr_cont(... to printk(KERN_CONT ... #1684: FILE: drivers/mfd/ab8500-core.c:1684: + printk(KERN_CONT " None\n"); WARNING: printk() should include KERN_ facility level #1695: FILE: drivers/mfd/ab8500-core.c:1695: + printk("\"%s\" ", turn_on_status[i]); WARNING: printk() should include KERN_ facility level #1700: FILE: drivers/mfd/ab8500-core.c:1700: + printk("None\n"); total: 5 errors, 14 warnings, 1869 lines checked Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
1 parent cd63a89 commit 7ccf40b

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

‎drivers/mfd/ab8500-core.c

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ static const int ab9540_irq_regoffset[AB9540_NUM_IRQ_REGS] = {
148148

149149
/* AB8540 support */
150150
static const int ab8540_irq_regoffset[AB8540_NUM_IRQ_REGS] = {
151-
0, 1, 2, 3, 4, -1, -1, -1, -1, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22, 23,
152-
25, 26, 27, 28, 29, 30, 31,
151+
0, 1, 2, 3, 4, -1, -1, -1, -1, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22,
152+
23, 25, 26, 27, 28, 29, 30, 31,
153153
};
154154

155155
static const char ab8500_version_str[][7] = {
@@ -322,7 +322,7 @@ static int ab8500_mask_and_set_register(struct device *dev,
322322
struct ab8500 *ab8500 = dev_get_drvdata(dev->parent);
323323

324324
atomic_inc(&ab8500->transfer_ongoing);
325-
ret= mask_and_set_register_interruptible(ab8500, bank, reg,
325+
ret = mask_and_set_register_interruptible(ab8500, bank, reg,
326326
bitmask, bitvalues);
327327
atomic_dec(&ab8500->transfer_ongoing);
328328
return ret;
@@ -415,9 +415,11 @@ static void ab8500_irq_unmask(struct irq_data *data)
415415
if (type & IRQ_TYPE_EDGE_FALLING) {
416416
if (offset >= AB8500_INT_GPIO6R && offset <= AB8500_INT_GPIO41R)
417417
ab8500->mask[index + 2] &= ~mask;
418-
else if (offset >= AB9540_INT_GPIO50R && offset <= AB9540_INT_GPIO54R)
418+
else if (offset >= AB9540_INT_GPIO50R &&
419+
offset <= AB9540_INT_GPIO54R)
419420
ab8500->mask[index + 1] &= ~mask;
420-
else if (offset == AB8540_INT_GPIO43R || offset == AB8540_INT_GPIO44R)
421+
else if (offset == AB8540_INT_GPIO43R ||
422+
offset == AB8540_INT_GPIO44R)
421423
/* Here the falling IRQ is one bit lower */
422424
ab8500->mask[index] &= ~(mask << 1);
423425
else
@@ -451,7 +453,7 @@ static void update_latch_offset(u8 *offset, int i)
451453
/* Fix inconsistent ab8540 bit mapping... */
452454
if (unlikely(*offset == 16))
453455
*offset = 25;
454-
if ((i==3) && (*offset >= 24))
456+
if ((i == 3) && (*offset >= 24))
455457
*offset += 2;
456458
}
457459

@@ -573,8 +575,8 @@ static int ab8500_irq_map(struct irq_domain *d, unsigned int virq,
573575
}
574576

575577
static struct irq_domain_ops ab8500_irq_ops = {
576-
.map = ab8500_irq_map,
577-
.xlate = irq_domain_xlate_twocell,
578+
.map = ab8500_irq_map,
579+
.xlate = irq_domain_xlate_twocell,
578580
};
579581

580582
static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np)
@@ -1551,7 +1553,7 @@ static struct attribute_group ab9540_attr_group = {
15511553

15521554
static int ab8500_probe(struct platform_device *pdev)
15531555
{
1554-
static char *switch_off_status[] = {
1556+
static const char *switch_off_status[] = {
15551557
"Swoff bit programming",
15561558
"Thermal protection activation",
15571559
"Vbat lower then BattOk falling threshold",
@@ -1560,7 +1562,7 @@ static int ab8500_probe(struct platform_device *pdev)
15601562
"Battery level lower than power on reset threshold",
15611563
"Power on key 1 pressed longer than 10 seconds",
15621564
"DB8500 thermal shutdown"};
1563-
static char *turn_on_status[] = {
1565+
static const char *turn_on_status[] = {
15641566
"Battery rising (Vbat)",
15651567
"Power On Key 1 dbF",
15661568
"Power On Key 2 dbF",
@@ -1579,7 +1581,7 @@ static int ab8500_probe(struct platform_device *pdev)
15791581
int i;
15801582
u8 value;
15811583

1582-
ab8500 = devm_kzalloc(&pdev->dev, sizeof *ab8500, GFP_KERNEL);
1584+
ab8500 = devm_kzalloc(&pdev->dev, sizeof(*ab8500), GFP_KERNEL);
15831585
if (!ab8500)
15841586
return -ENOMEM;
15851587

@@ -1636,7 +1638,7 @@ static int ab8500_probe(struct platform_device *pdev)
16361638
ab8500->mask_size = AB8540_NUM_IRQ_REGS;
16371639
ab8500->irq_reg_offset = ab8540_irq_regoffset;
16381640
ab8500->it_latchhier_num = AB8540_IT_LATCHHIER_NUM;
1639-
}/* Configure AB8500 or AB9540 IRQ */
1641+
} /* Configure AB8500 or AB9540 IRQ */
16401642
else if (is_ab9540(ab8500) || is_ab8505(ab8500)) {
16411643
ab8500->mask_size = AB9540_NUM_IRQ_REGS;
16421644
ab8500->irq_reg_offset = ab9540_irq_regoffset;
@@ -1646,10 +1648,12 @@ static int ab8500_probe(struct platform_device *pdev)
16461648
ab8500->irq_reg_offset = ab8500_irq_regoffset;
16471649
ab8500->it_latchhier_num = AB8500_IT_LATCHHIER_NUM;
16481650
}
1649-
ab8500->mask = devm_kzalloc(&pdev->dev, ab8500->mask_size, GFP_KERNEL);
1651+
ab8500->mask = devm_kzalloc(&pdev->dev, ab8500->mask_size,
1652+
GFP_KERNEL);
16501653
if (!ab8500->mask)
16511654
return -ENOMEM;
1652-
ab8500->oldmask = devm_kzalloc(&pdev->dev, ab8500->mask_size, GFP_KERNEL);
1655+
ab8500->oldmask = devm_kzalloc(&pdev->dev, ab8500->mask_size,
1656+
GFP_KERNEL);
16531657
if (!ab8500->oldmask)
16541658
return -ENOMEM;
16551659

@@ -1674,14 +1678,13 @@ static int ab8500_probe(struct platform_device *pdev)
16741678
if (value) {
16751679
for (i = 0; i < ARRAY_SIZE(switch_off_status); i++) {
16761680
if (value & 1)
1677-
printk(KERN_CONT " \"%s\"",
1678-
switch_off_status[i]);
1681+
pr_cont(" \"%s\"", switch_off_status[i]);
16791682
value = value >> 1;
16801683

16811684
}
1682-
printk(KERN_CONT "\n");
1685+
pr_cont("\n");
16831686
} else {
1684-
printk(KERN_CONT " None\n");
1687+
pr_cont(" None\n");
16851688
}
16861689
ret = get_register_interruptible(ab8500, AB8500_SYS_CTRL1_BLOCK,
16871690
AB8500_TURN_ON_STATUS, &value);
@@ -1692,12 +1695,12 @@ static int ab8500_probe(struct platform_device *pdev)
16921695
if (value) {
16931696
for (i = 0; i < ARRAY_SIZE(turn_on_status); i++) {
16941697
if (value & 1)
1695-
printk("\"%s\" ", turn_on_status[i]);
1698+
pr_cont("\"%s\" ", turn_on_status[i]);
16961699
value = value >> 1;
16971700
}
1698-
printk("\n");
1701+
pr_cont("\n");
16991702
} else {
1700-
printk("None\n");
1703+
pr_cont("None\n");
17011704
}
17021705

17031706
if (plat && plat->init)

0 commit comments

Comments
 (0)