From patchwork Sun Jan 18 11:39:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 430177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 717C61401AC for ; Sun, 18 Jan 2015 22:41:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbbARLj5 (ORCPT ); Sun, 18 Jan 2015 06:39:57 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:41508 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752096AbbARLjy (ORCPT ); Sun, 18 Jan 2015 06:39:54 -0500 Received: by mail-la0-f41.google.com with SMTP id hv19so24756204lab.0; Sun, 18 Jan 2015 03:39:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r1rfVJuSZ+1i4fA4jsNc5JltrvCLT7TGv04URIj/jYk=; b=mFHofEHOs8tsN68CmA6O9mtrbRzJbAS9cQnpliQL2Ialr/6BEPG/FxshEuVnhCC+E2 1KWv3N4LJjEBip9vRANmC+A8vRlpDDAc1wSoSIUzwowWWWDWzavT6Mj7quC6XM2Wg42A iprB4yhn+nvNz642AydyV4CP9/OcRruqSEI2JaUKd8mjfl8PgGT4T74ng8MzaDg0fM3x 2jSDsHiqOcJ9uPLI9R9zRdOyQySV8QHKmjQ+9ynqJK5b2a4Az/c8ewnSoGYG9mF6zgUn msXtk63TD9B99j4CuaBm/wQxv6SyGXgsOIJ8so5/bZoWWJ5/bLqeoQ5xuI5qR37dRNgk X6KA== X-Received: by 10.112.8.69 with SMTP id p5mr24277903lba.97.1421581192107; Sun, 18 Jan 2015 03:39:52 -0800 (PST) Received: from localhost.localdomain (x1-6-30-46-9a-6d-3c-54.cpe.webspeed.dk. [2.108.161.190]) by mx.google.com with ESMTPSA id s16sm2829856lal.5.2015.01.18.03.39.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Jan 2015 03:39:51 -0800 (PST) From: Ricardo Ribalda Delgado To: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado , Linus Walleij , Alexandre Courbot , John Crispin Subject: [PATCH 2/8] gpio/-mm-lantiq: Use devm_kzalloc Date: Sun, 18 Jan 2015 12:39:27 +0100 Message-Id: <1421581173-28416-3-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421581173-28416-1-git-send-email-ricardo.ribalda@gmail.com> References: <1421581173-28416-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Replace kzalloc with the device managed devm_kzalloc Cc: Linus Walleij Cc: Alexandre Courbot Cc: John Crispin Signed-off-by: Ricardo Ribalda Delgado --- drivers/gpio/gpio-mm-lantiq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c index f228b1c..7890163 100644 --- a/drivers/gpio/gpio-mm-lantiq.c +++ b/drivers/gpio/gpio-mm-lantiq.c @@ -107,14 +107,13 @@ static int ltq_mm_probe(struct platform_device *pdev) struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct ltq_mm *chip; const __be32 *shadow; - int ret = 0; if (!res) { dev_err(&pdev->dev, "failed to get memory resource\n"); return -ENOENT; } - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -129,10 +128,7 @@ static int ltq_mm_probe(struct platform_device *pdev) if (shadow) chip->shadow = be32_to_cpu(*shadow); - ret = of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip); - if (ret) - kfree(chip); - return ret; + return of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip); } static const struct of_device_id ltq_mm_match[] = {