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

mfd: 88pm860x-core: Repair formatting issues

Fixes the following checkpatch warnings:

WARNING: please, no space before tabs
#5: FILE: drivers/mfd/88pm860x-core.c:5:
+ * ^IHaojian Zhuang <haojian.zhuang@marvell.com>$

WARNING: line over 80 characters
#143: FILE: drivers/mfd/88pm860x-core.c:143:
+ {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},

WARNING: line over 80 characters
#153: FILE: drivers/mfd/88pm860x-core.c:153:
+ {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},

WARNING: line over 80 characters
#154: FILE: drivers/mfd/88pm860x-core.c:154:
+ {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,},

WARNING: line over 80 characters
#155: FILE: drivers/mfd/88pm860x-core.c:155:
+ {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging fault", IORESOURCE_IRQ,},

WARNING: line over 80 characters
#156: FILE: drivers/mfd/88pm860x-core.c:156:
+ {PM8607_IRQ_GPADC1, PM8607_IRQ_GPADC1, "battery temperature", IORESOURCE_IRQ,},

WARNING: Avoid unnecessary line continuations
#571: FILE: drivers/mfd/88pm860x-core.c:571:
+ struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \

WARNING: line over 80 characters
#634: FILE: drivers/mfd/88pm860x-core.c:634:
+ ret = request_threaded_irq(chip->core_irq, NULL, pm860x_irq, flags | IRQF_ONESHOT,

WARNING: Unnecessary parentheses - maybe == should be = ?
#874: FILE: drivers/mfd/88pm860x-core.c:874:
+ if ((pdata == NULL))

WARNING: quoted string split across lines
#1001: FILE: drivers/mfd/88pm860x-core.c:1001:
+ dev_err(chip->dev, "Failed to detect Marvell 88PM8607. "
+ "Chip ID: %02x\n", ret);

WARNING: quoted string split across lines
#1124: FILE: drivers/mfd/88pm860x-core.c:1124:
+ dev_err(dev, "Not found \"marvell,88pm860x-slave-addr\" "
+ "property\n");

total: 0 errors, 11 warnings, 1281 lines checked

Signed-off-by: Lee Jones <lee.jones@linaro.org>

Lee Jones 2e57848f dc543929

+22 -15
+22 -15
drivers/mfd/88pm860x-core.c
··· 2 2 * Base driver for Marvell 88PM8607 3 3 * 4 4 * Copyright (C) 2009 Marvell International Ltd. 5 - * Haojian Zhuang <haojian.zhuang@marvell.com> 5 + * 6 + * Author: Haojian Zhuang <haojian.zhuang@marvell.com> 6 7 * 7 8 * This program is free software; you can redistribute it and/or modify 8 9 * it under the terms of the GNU General Public License version 2 as ··· 141 140 /* Headset insertion or removal */ 142 141 {PM8607_IRQ_HEADSET, PM8607_IRQ_HEADSET, "headset", IORESOURCE_IRQ,}, 143 142 /* Audio short */ 144 - {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, 143 + {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", 144 + IORESOURCE_IRQ,}, 145 145 }; 146 146 147 147 static struct resource battery_resources[] = { ··· 152 150 153 151 static struct resource charger_resources[] = { 154 152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, 155 - {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, 156 - {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,}, 157 - {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging fault", IORESOURCE_IRQ,}, 158 - {PM8607_IRQ_GPADC1, PM8607_IRQ_GPADC1, "battery temperature", IORESOURCE_IRQ,}, 153 + {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", 154 + IORESOURCE_IRQ,}, 155 + {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", 156 + IORESOURCE_IRQ,}, 157 + {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging fault", 158 + IORESOURCE_IRQ,}, 159 + {PM8607_IRQ_GPADC1, PM8607_IRQ_GPADC1, "battery temperature", 160 + IORESOURCE_IRQ,}, 159 161 {PM8607_IRQ_VBAT, PM8607_IRQ_VBAT, "battery voltage", IORESOURCE_IRQ,}, 160 162 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, 161 163 }; ··· 574 568 static int device_irq_init(struct pm860x_chip *chip, 575 569 struct pm860x_platform_data *pdata) 576 570 { 577 - struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \ 578 - : chip->companion; 571 + struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? 572 + chip->client : chip->companion; 579 573 unsigned char status_buf[INT_STATUS_NUM]; 580 574 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT; 581 575 int data, mask, ret = -EINVAL; ··· 637 631 if (!chip->core_irq) 638 632 goto out; 639 633 640 - ret = request_threaded_irq(chip->core_irq, NULL, pm860x_irq, flags | IRQF_ONESHOT, 641 - "88pm860x", chip); 634 + ret = request_threaded_irq(chip->core_irq, NULL, pm860x_irq, 635 + flags | IRQF_ONESHOT, "88pm860x", chip); 642 636 if (ret) { 643 637 dev_err(chip->dev, "Failed to request IRQ: %d\n", ret); 644 638 chip->core_irq = 0; ··· 877 871 { 878 872 int ret; 879 873 880 - if ((pdata == NULL)) 874 + if (!pdata) 881 875 return; 882 876 883 877 rtc_devs[0].platform_data = pdata->rtc; ··· 1003 997 ret); 1004 998 break; 1005 999 default: 1006 - dev_err(chip->dev, "Failed to detect Marvell 88PM8607. " 1007 - "Chip ID: %02x\n", ret); 1000 + dev_err(chip->dev, 1001 + "Failed to detect Marvell 88PM8607. Chip ID: %02x\n", 1002 + ret); 1008 1003 goto out; 1009 1004 } 1010 1005 ··· 1127 1120 ret = of_property_read_u32(np, "marvell,88pm860x-slave-addr", 1128 1121 &pdata->companion_addr); 1129 1122 if (ret) { 1130 - dev_err(dev, "Not found \"marvell,88pm860x-slave-addr\" " 1131 - "property\n"); 1123 + dev_err(dev, 1124 + "Not found \"marvell,88pm860x-slave-addr\" property\n"); 1132 1125 pdata->companion_addr = 0; 1133 1126 } 1134 1127 return 0;