From patchwork Fri Dec 21 09:45:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1902731 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 A838440076 for ; Fri, 21 Dec 2012 09:50:18 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TlzCH-0006GW-Md; Fri, 21 Dec 2012 09:47:17 +0000 Received: from mail-pb0-f42.google.com ([209.85.160.42]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TlzAx-0005im-PF for linux-arm-kernel@lists.infradead.org; Fri, 21 Dec 2012 09:45:57 +0000 Received: by mail-pb0-f42.google.com with SMTP id rp2so2620378pbb.29 for ; Fri, 21 Dec 2012 01:45:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=LxB5w1R1jdasapQGZuasKiHSMGYrXZc1PXrsMyyFL+w=; b=c0kD6rSG0OUMkgIHNZdsQpbHhS1NHK9lMRvV5e1XdXTtTLI04SAKCcG/jlfQ8oMpc4 RgLq9nULpXjA1R5tzTYG+w6yeBCuQMMik5vdl5VqTGGHb7yYWCKxKoYVy4LSLfrQhsCA 41DUApTy+5VQBDWeQ5BW7/yKDS5u62sPKTmgoMS+wVAkvbz7S/0BQpCAlFYP3Q35gCqm Urw7kMVNOBFq4Mvb1OX3PAA4LimK6CXPkhFM5GuUR72pcOI1jJtfZl+lSZHzDBJXXSgq qojsD2fnBzd3I+J2QZUL0/Gs+oVFGwUApMlafSjXdvBmDi2uiQbDdtbSE7zlw1CHQ0IV I83g== X-Received: by 10.66.81.68 with SMTP id y4mr35430562pax.66.1356083154311; Fri, 21 Dec 2012 01:45:54 -0800 (PST) Received: from localhost.localdomain ([116.224.148.148]) by mx.google.com with ESMTPS id t5sm7104258paw.20.2012.12.21.01.45.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 01:45:53 -0800 (PST) From: Haojian Zhuang To: linus.walleij@linaro.org, tony@atomide.com, linux-arm-kernel@lists.infradead.org, swarren@nvidia.com Subject: [PATCH v6 7/8] i2c: pxa: use devm_kzalloc Date: Fri, 21 Dec 2012 17:45:17 +0800 Message-Id: <1356083118-18857-8-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356083118-18857-1-git-send-email-haojian.zhuang@linaro.org> References: <1356083118-18857-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQnO46/4MUE5UYeN6OXvvUwJM5K+Yy+eh738RtlVAEp0D67vBDP1vIJuJHy6Eg+wQKOrqy7x X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121221_044556_009678_DE42CF5B X-CRM114-Status: GOOD ( 13.56 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.42 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ben Dooks , 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 From: Haojian Zhuang Use devm_kzalloc & add checking in probe() function. Signed-off-by: Haojian Zhuang Cc: Ben Dooks --- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++---------------- 1 file 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; }