From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/19] mfd: as3711: Repair OOM and 'line over 80 chars' formatting warnings
Date: Mon, 7 Dec 2015 11:50:24 +0000 [thread overview]
Message-ID: <1449489032-14374-12-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1449489032-14374-1-git-send-email-lee.jones@linaro.org>
WARNING: Possible unnecessary 'out of memory' message
+ if (!pdata) {
+ dev_err(&client->dev, "Failed to allocate pdata\n");
WARNING: Possible unnecessary 'out of memory' message
+ if (!as3711) {
+ dev_err(&client->dev, "Memory allocation failed\n");
WARNING: line over 80 characters
+ dev_err(&client->dev, "regmap initialization failed: %d\n", ret);
WARNING: line over 80 characters
+ /* We can reuse as3711_subdevs[], it will be copied in mfd_add_devices() */
WARNING: line over 80 characters
+ as3711_subdevs[AS3711_REGULATOR].platform_data = &pdata->regulator;
WARNING: line over 80 characters
+ as3711_subdevs[AS3711_REGULATOR].pdata_size = sizeof(pdata->regulator);
WARNING: line over 80 characters
+ as3711_subdevs[AS3711_BACKLIGHT].platform_data = &pdata->backlight;
WARNING: line over 80 characters
+ as3711_subdevs[AS3711_BACKLIGHT].pdata_size = sizeof(pdata->backlight);
total: 0 errors, 8 warnings, 236 lines checked
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/as3711.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index d001f7e2..94d67a6 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -136,17 +136,13 @@ static int as3711_i2c_probe(struct i2c_client *client,
} else {
pdata = devm_kzalloc(&client->dev,
sizeof(*pdata), GFP_KERNEL);
- if (!pdata) {
- dev_err(&client->dev, "Failed to allocate pdata\n");
+ if (!pdata)
return -ENOMEM;
- }
}
as3711 = devm_kzalloc(&client->dev, sizeof(struct as3711), GFP_KERNEL);
- if (!as3711) {
- dev_err(&client->dev, "Memory allocation failed\n");
+ if (!as3711)
return -ENOMEM;
- }
as3711->dev = &client->dev;
i2c_set_clientdata(client, as3711);
@@ -157,7 +153,8 @@ static int as3711_i2c_probe(struct i2c_client *client,
as3711->regmap = devm_regmap_init_i2c(client, &as3711_regmap_config);
if (IS_ERR(as3711->regmap)) {
ret = PTR_ERR(as3711->regmap);
- dev_err(&client->dev, "regmap initialization failed: %d\n", ret);
+ dev_err(&client->dev,
+ "regmap initialization failed: %d\n", ret);
return ret;
}
@@ -172,12 +169,19 @@ static int as3711_i2c_probe(struct i2c_client *client,
return -ENODEV;
dev_info(as3711->dev, "AS3711 detected: %x:%x\n", id1, id2);
- /* We can reuse as3711_subdevs[], it will be copied in mfd_add_devices() */
+ /*
+ * We can reuse as3711_subdevs[],
+ * it will be copied in mfd_add_devices()
+ */
if (pdata) {
- as3711_subdevs[AS3711_REGULATOR].platform_data = &pdata->regulator;
- as3711_subdevs[AS3711_REGULATOR].pdata_size = sizeof(pdata->regulator);
- as3711_subdevs[AS3711_BACKLIGHT].platform_data = &pdata->backlight;
- as3711_subdevs[AS3711_BACKLIGHT].pdata_size = sizeof(pdata->backlight);
+ as3711_subdevs[AS3711_REGULATOR].platform_data =
+ &pdata->regulator;
+ as3711_subdevs[AS3711_REGULATOR].pdata_size =
+ sizeof(pdata->regulator);
+ as3711_subdevs[AS3711_BACKLIGHT].platform_data =
+ &pdata->backlight;
+ as3711_subdevs[AS3711_BACKLIGHT].pdata_size =
+ sizeof(pdata->backlight);
} else {
as3711_subdevs[AS3711_REGULATOR].platform_data = NULL;
as3711_subdevs[AS3711_REGULATOR].pdata_size = 0;
--
1.9.1
next prev parent reply other threads:[~2015-12-07 11:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 11:50 [PATCH 00/19] mfd: Lots of clean-ups Lee Jones
2015-12-07 11:50 ` [PATCH 01/19] mfd: aat2870-core: Remove unnecessary 'out of memory' message Lee Jones
2015-12-07 11:50 ` [PATCH 02/19] mfd: ab3100-core.c: Fix multiple warnings reported by Checkpatch Lee Jones
2015-12-07 11:50 ` [PATCH 03/19] mfd: ab2100-otp: Remove pointless 'out of memory' error message Lee Jones
2015-12-07 11:50 ` [PATCH 04/19] mfd: ab8500-core: Fix many warnings reported by Checkpatch Lee Jones
2015-12-07 11:50 ` [PATCH 05/19] mfd: ab8500-debugfs: Clean-up non-conforming commenting and print formatting Lee Jones
2015-12-07 11:50 ` [PATCH 06/19] mfd: ab8500-gpadc: Squash a whole bunch of Checkpatch warnings and one error Lee Jones
2015-12-07 11:50 ` [PATCH 07/19] mfd: ab8500-sysctrl: Fix Constify, printk => pr_info and formatting issues Lee Jones
2015-12-07 11:50 ` [PATCH 08/19] mfd: adp5520: Some trivial 'no space before tab' fixes Lee Jones
2015-12-07 11:50 ` [PATCH 09/19] mfd: arizona-core: msleep() is unreliable for anything <20ms use usleep_range() instead Lee Jones
2015-12-08 14:33 ` Charles Keepax
2015-12-08 15:45 ` Lee Jones
2015-12-07 11:50 ` [PATCH 10/19] mfd: arizona-i2c: Add blank line formatting after declaration Lee Jones
2015-12-08 14:33 ` Charles Keepax
2015-12-07 11:50 ` Lee Jones [this message]
2015-12-07 11:50 ` [PATCH 12/19] mfd: asic3: Fix a plethora of Checkpatch errors and warnings Lee Jones
2015-12-07 11:50 ` [PATCH 13/19] mfd: cros_ec_i2c: Fix trivial 'tabs before spaces' whitespace issue Lee Jones
2015-12-07 11:50 ` [PATCH 14/19] mfd: cros_ec_spi: Repair comparison ordering issue Lee Jones
2015-12-07 11:50 ` [PATCH 15/19] mfd: cs5535-mfd: Add missing line spacing and make local array static Lee Jones
2015-12-07 11:50 ` [PATCH 16/19] mfd: da903x: Fix white space and split string issues Lee Jones
2015-12-07 11:50 ` [PATCH 17/19] mfd: da9052-i2c: Fix tabbing/whitespace issue Lee Jones
2015-12-07 11:50 ` [PATCH 18/19] mfd: da9052-irq: Fix trivial 'space before comma' error Lee Jones
2015-12-07 11:50 ` [PATCH 19/19] mfd: davinci_voicecodec: Remove pointless 'out of memory' error message Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449489032-14374-12-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).