Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1576301pxb; Fri, 20 Aug 2021 08:43:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZ+vE0UUp8l3BxPNBkX0s07qyRAOp2rYuMQ9+6x9ExG/P4sRTOBuWIoLrjAwDNa860/KOu X-Received: by 2002:a05:6402:52:: with SMTP id f18mr22769305edu.338.1629474201357; Fri, 20 Aug 2021 08:43:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629474201; cv=none; d=google.com; s=arc-20160816; b=tCrLhb54NPoYzkCjJ/aj+qNYNx4ELpqINDwpcPy/AUS3m+8RMQTsIAe4KutbX4u/S/ VbnmLLsD8YYdqq/LvsOKn1bjBfMSm0T9wm1MgyaSiQaL1HYBwg89rmJ7ORoPATwb1yQh tn1mfZLj8Vf2i33wHCvEVwEkPkMQ9t6xSKn+fkN/1NdbaWxEh0R+jgWCNJmQUSs96Nya eYVFipq5KseWSYV5Ugk9xjt8S6hj9/5kpFh388ZmVSv427W1xddoco6iF9dzyIX0jD2q j3XgoKb5LUlciQoW+p0qdMaZIGXnxORoTtJVsEf2uI5Pdo7Dw/qfe8n7XmIUPDjAsUZl 8C4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=fLZKVgA3D1IcIqxG6PrpNvTLtQozyVCyWbd8cX3iXsE=; b=Ub0LnctLpkwXHloZSbopw1FpWryqwQo+sug/lGg8aytgrIKXaTU+4fX8C4aJLab3qW Zg91NvKK9p51stzfpIzuPeYckGVq8jIXtkTocjLK/y3lwacz5m01FOsnM7nGBsa9m32Z bCWstQ0JeNuf/4TB5Hsz6z9nkZTN0OVcdTANgo8rS13zHWxAaYgDhgnl2shaAtbVim1n uGpGmer8OdRcbJ099bjuLQ6iR9147BXcVN4p77HCA6ov0qrRD6w691BTYfKEYe/5rtgP 1IMKCj4bcVKjlK38lq8L+WyqssiEkr3tSFiK+6KEng3i/qn0voNes5WvAiMb7lFiK+1U czIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h20si6740812edw.295.2021.08.20.08.42.54; Fri, 20 Aug 2021 08:43:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241193AbhHTPi5 (ORCPT + 99 others); Fri, 20 Aug 2021 11:38:57 -0400 Received: from smtp09.smtpout.orange.fr ([80.12.242.131]:58993 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241168AbhHTPix (ORCPT ); Fri, 20 Aug 2021 11:38:53 -0400 Received: from pop-os.home ([90.126.253.178]) by mwinf5d04 with ME id jreE2500L3riaq203reE2M; Fri, 20 Aug 2021 17:38:14 +0200 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 20 Aug 2021 17:38:14 +0200 X-ME-IP: 90.126.253.178 From: Christophe JAILLET To: linus.walleij@linaro.org, bgolaszewski@baylibre.com, alexandru.marginean@nxp.com, Laurentiu.Tudor@nxp.com, hui.song_1@nxp.com, andy.shevchenko@gmail.com, ran.wang_1@nxp.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 3/3] gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak Date: Fri, 20 Aug 2021 17:38:13 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If an error occurs after a 'gpiochip_add_data()' call it must be undone by a corresponding 'gpiochip_remove()' as already done in the remove function. To simplify the code a fix a leak in the error handling path of the probe, use the managed version instead (i.e. 'devm_gpiochip_add_data()') Fixes: 698b8eeaed72 ("gpio/mpc8xxx: change irq handler from chained to normal") Signed-off-by: Christophe JAILLET --- drivers/gpio/gpio-mpc8xxx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index fa4aaeced3f1..70d6ae20b1da 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -380,7 +380,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) is_acpi_node(fwnode)) gc->write_reg(mpc8xxx_gc->regs + GPIO_IBE, 0xffffffff); - ret = gpiochip_add_data(gc, mpc8xxx_gc); + ret = devm_gpiochip_add_data(&pdev->dev, gc, mpc8xxx_gc); if (ret) { dev_err(&pdev->dev, "GPIO chip registration failed with status %d\n", ret); @@ -429,8 +429,6 @@ static int mpc8xxx_remove(struct platform_device *pdev) irq_domain_remove(mpc8xxx_gc->irq); } - gpiochip_remove(&mpc8xxx_gc->gc); - return 0; } -- 2.30.2