From patchwork Mon Oct 22 16:08:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1626891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 571094020E for ; Mon, 22 Oct 2012 16:15:00 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TQKc3-0005rS-Hh; Mon, 22 Oct 2012 16:12:24 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TQKbO-0005Sn-KU for linux-arm-kernel@lists.infradead.org; Mon, 22 Oct 2012 16:11:43 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so1923085pad.36 for ; Mon, 22 Oct 2012 09:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=MyP9FJNMIj3jDgQPB67qVlpoca8GfyMwTQwBDKIaa/I=; b=fU7yX+YVHkb5nytlfqUK3Qk3rDe2CNDf878M7P7k9iPVYBvdJ8hSiJjHr0SmS9b+PV UHMX2GfxJc9Q8oHI5qCABmc3FoH6g9UqaO0lN1Fgr9oWX9tShoZo0/grlhroXOxKSWYk XgdGlV8yZi0c8eGdbSAFudRq0mtPgtFsKCCIx3wnQCHqJLwFHsAqlRSq0EQVVxQ2rZQX jlbRpbSH6a32L3vAQP12lt9MS+2DPSEtf6m3JJTA6/0rZ+xOeBS4I//xBSuST/nymRhB SH+5/sl4P0npKv29aIiCYXqwBpoFYeiVR+Undx3cpqe/Uv/1z9hwTNm5A8wodOw5wlfV /OkA== Received: by 10.68.132.165 with SMTP id ov5mr30800508pbb.105.1350922301687; Mon, 22 Oct 2012 09:11:41 -0700 (PDT) Received: from localhost ([58.39.221.134]) by mx.google.com with ESMTPS id ka4sm6138148pbc.61.2012.10.22.09.11.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:11:40 -0700 (PDT) From: Haojian Zhuang To: swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, tony@atomide.com, devicetree-discuss@lists.ozlabs.org, linus.walleij@linaro.org Subject: [PATCH v2 7/9] i2c: pxa: use devm_kzalloc Date: Tue, 23 Oct 2012 00:08:57 +0800 Message-Id: <1350922139-3693-8-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> References: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use devm_kzalloc & add checking in probe() function. Signed-off-by: Haojian Zhuang --- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..7c8b5d0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1078,6 +1078,8 @@ static int i2c_pxa_probe_pdata(struct platform_device *pdev, struct i2c_pxa_platform_data *plat = pdev->dev.platform_data; const struct platform_device_id *id = platform_get_device_id(pdev); + if (!id) + return -EINVAL; *i2c_types = id->driver_data; if (plat) { i2c->use_pio = plat->use_pio; @@ -1094,29 +1096,23 @@ static int i2c_pxa_probe(struct platform_device *dev) struct resource *res = NULL; int ret, irq; - i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL); - if (!i2c) { - ret = -ENOMEM; - goto emalloc; - } + i2c = devm_kzalloc(&dev->dev, sizeof(struct pxa_i2c), GFP_KERNEL); + if (!i2c) + return -ENOMEM; ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type); if (ret > 0) ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); if (ret < 0) - goto eclk; + return ret; res = platform_get_resource(dev, IORESOURCE_MEM, 0); irq = platform_get_irq(dev, 0); - if (res == NULL || irq < 0) { - ret = -ENODEV; - goto eclk; - } + if (res == NULL || irq < 0) + return -ENODEV; - if (!request_mem_region(res->start, resource_size(res), res->name)) { - ret = -ENOMEM; - goto eclk; - } + if (!request_mem_region(res->start, resource_size(res), res->name)) + return -ENOMEM; i2c->adap.owner = THIS_MODULE; i2c->adap.retries = 5; @@ -1209,8 +1205,6 @@ ereqirq: eremap: clk_put(i2c->clk); eclk: - kfree(i2c); -emalloc: release_mem_region(res->start, resource_size(res)); return ret; }