From patchwork Mon Dec 7 11:50:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 57767 Delivered-To: patch@linaro.org Received: by 10.202.179.86 with SMTP id c83csp944660oif; Mon, 7 Dec 2015 03:51:09 -0800 (PST) X-Received: by 10.66.164.234 with SMTP id yt10mr42641449pab.11.1449489069352; Mon, 07 Dec 2015 03:51:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i27si1178195pfj.107.2015.12.07.03.51.09; Mon, 07 Dec 2015 03:51:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932243AbbLGLvC (ORCPT + 28 others); Mon, 7 Dec 2015 06:51:02 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:34013 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126AbbLGLuv (ORCPT ); Mon, 7 Dec 2015 06:50:51 -0500 Received: by wmvv187 with SMTP id v187so162473146wmv.1 for ; Mon, 07 Dec 2015 03:50:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=PT2f6R3wcqiZxA0mpYxJzGZYEGR/bKjlpaI6Z8/7/Hw=; b=VmuAx11/vCXxJ3NEsYRWp9pF8tWwuAyBsB+KmqFfOTxySyA0GGv/xfGbXN83hCW3cA Cfkhd5SNPR8cQVHMpD9wjX+WLyXKzjh2boRlagAtRBtCjFxjMzKr01NRxcAhX4F/1uWV LpSxWctDgMHPITZQRsplQ81H0TWE4So2h7yEAcxmlbPZ5xs/s+2M83j2NnKFMtEYTpzS Bc+zKYtWiBQGVwbG99NIS1NZFoQAnamZgF3hgBqf3i2XkMfye89Dw7iJGh3JF8VIZ5tq 7+wWo8a7PFVOvCuTK39P4QF6avMse6kRFxlPc0vOdHN/7f+NJMdhiFMTplzSZ0O5CcyM tDqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PT2f6R3wcqiZxA0mpYxJzGZYEGR/bKjlpaI6Z8/7/Hw=; b=DxsjlzdqcYUvmMeb3L8ocHRPYgbY5lLCW61tpWS7Gx0DYgXoJeMU4S92LZn88hPLLw sUwBwqCnCSvh5dHRHwRZm9XovGpbaQ6pX0WHaACDnnEZ0N0/L4UYnHIIwCqLGc7weaJZ zNz0vo8gCUlZRXxg2LClD46W2vzvWrNQI2maL92uGiJgIhFcvZKv+g2FRL3m6+xtEDBi RpM+VGMtdF/gIyeSCs/543lSgt5h6ywyZA8MrHBnmUNZqXc4k9Nv52TcDKoZWJW+sRn0 0TVsyZvBPTwoAVDXNAZdq1ZNyO/7/fSqBFUpf0NJmRTpK0TofIBdzSCowatXxVwohRRN irsw== X-Gm-Message-State: ALoCoQk1DInahAoOo7g+bRFwVhbyetghXyy5rSEQQdz88R01tkpA5Sv6bDL6fMv/4WyEhOKW5Olu X-Received: by 10.195.18.6 with SMTP id gi6mr35569736wjd.83.1449489050320; Mon, 07 Dec 2015 03:50:50 -0800 (PST) Received: from localhost.localdomain (host81-129-174-134.range81-129.btcentralplus.com. [81.129.174.134]) by smtp.gmail.com with ESMTPSA id z1sm24806533wje.35.2015.12.07.03.50.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Dec 2015 03:50:49 -0800 (PST) From: Lee Jones 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 Message-Id: <1449489032-14374-12-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449489032-14374-1-git-send-email-lee.jones@linaro.org> References: <1449489032-14374-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- drivers/mfd/as3711.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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;