Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp257118ybl; Wed, 4 Dec 2019 02:12:03 -0800 (PST) X-Google-Smtp-Source: APXvYqzAYSpP5FcdcRVvv/fygocYMUq/rzrw/HTuoE7TLqVdqV1uhaDEaFrPYUp9/dwZQTn/v1e4 X-Received: by 2002:a54:4896:: with SMTP id r22mr1933176oic.30.1575454323663; Wed, 04 Dec 2019 02:12:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575454323; cv=none; d=google.com; s=arc-20160816; b=LtZm/mu0ptNNbvzt7O3mig+dqJ1i6db7SGh/+pcrJobIhYudYIcW8H45muEu9/bXp5 P+RjfN8gJ8456uVaplOc7C8ly8IZ763dABsVW2t2pyGjoclknHL1G/kuY4HhdW4iy53X I2dACwP6jpXvQ16s02BaSzXFRw51Ke60SI0ytA9WVcnd10DFMY+QU18d6ARlxvTbjtF3 l0l/UauhwohU/QkX2VQUdm2gfWFqDBoZqWyk3SZokfFCl5SiAtjXt7ZZ0rdHwx+ifboy /5A05gsK2TEda8+hHnvxf8AIgwtuc+MdKe8TNT7hIki8iAQkdi2yFlHTub785VeC/ClM FmYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=aVVKHg4KNmfV7IMUo/teaWuIhAVpeMTfo8aWF5zQzBc=; b=BsdCeWuhVE8QxbXvky4cs7tQNhQDp7v/nMQL4xd6hMoyAAOzX9qDoYwdgpP1eA8gBl iq9A25HXxIR9kwJ7fuxM46/nTht5l5gL4ghcPBOL90XE8piBUW9r6yMl04OKRnc8l2Ky QYgv9MxIuO0CgkMrrH+/Pm9dDznGZglxFuv8/B9NARp9aivZrh/NVKi1fwXewMnAlGvx Z3/13AaXLD5XYyQ0HDy+8ShkU7H7sF07F7EJ0+IYvvHn7ZNToK1wprYVcQDud2zMHdc3 P9C3z3dvc7JFYVR3GAMopufZ22lcj9dv4z1lImRwEqYJtjimcnUFJnEN5menGewjkD1m nWLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kalray.eu header.s=32AE1B44-9502-11E5-BA35-3734643DEF29 header.b=GJ8+87S1; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=kalray.eu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r6si2862822otq.95.2019.12.04.02.11.52; Wed, 04 Dec 2019 02:12:03 -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; dkim=pass header.i=@kalray.eu header.s=32AE1B44-9502-11E5-BA35-3734643DEF29 header.b=GJ8+87S1; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=kalray.eu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727714AbfLDKLK (ORCPT + 99 others); Wed, 4 Dec 2019 05:11:10 -0500 Received: from zimbra2.kalray.eu ([92.103.151.219]:56760 "EHLO zimbra2.kalray.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbfLDKLE (ORCPT ); Wed, 4 Dec 2019 05:11:04 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id 6DC0827E10A2; Wed, 4 Dec 2019 11:11:03 +0100 (CET) Received: from zimbra2.kalray.eu ([127.0.0.1]) by localhost (zimbra2.kalray.eu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id TS2caAzpPi7e; Wed, 4 Dec 2019 11:11:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id 1F09327E0A05; Wed, 4 Dec 2019 11:11:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 zimbra2.kalray.eu 1F09327E0A05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalray.eu; s=32AE1B44-9502-11E5-BA35-3734643DEF29; t=1575454263; bh=aVVKHg4KNmfV7IMUo/teaWuIhAVpeMTfo8aWF5zQzBc=; h=From:To:Date:Message-Id; b=GJ8+87S1BicJnRFUE8oQ0PJ865YJUjAG3U8n2jC7WlFm2h9m1/4TSDh8ATYbCnv4V tAz5jvATmcDzgi8NFCAg3bfkTFvawgENQ+S90+oaap9xMOxkVV6+1AKiDH9ZWyx00o +GTddyrmLpwJZUHz7mmEQZ77SuzkOJaw+vOecyDU= X-Virus-Scanned: amavisd-new at zimbra2.kalray.eu Received: from zimbra2.kalray.eu ([127.0.0.1]) by localhost (zimbra2.kalray.eu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id su1OHbrt4e0x; Wed, 4 Dec 2019 11:11:03 +0100 (CET) Received: from triton.lin.mbt.kalray.eu (unknown [192.168.37.25]) by zimbra2.kalray.eu (Postfix) with ESMTPSA id 02B6227E1552; Wed, 4 Dec 2019 11:11:03 +0100 (CET) From: Clement Leger To: linux-kernel@vger.kernel.org Cc: Clement Leger , Hoan Tran , Linus Walleij , linux-gpio@vger.kernel.org Subject: [PATCH 3/5] pinctrl: dw: use devm_gpiochip_add_data Date: Wed, 4 Dec 2019 11:10:37 +0100 Message-Id: <20191204101042.4275-4-cleger@kalray.eu> X-Mailer: git-send-email 2.15.0.276.g89ea799 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use managed gpiochip_add_data for easier handling of exit paths. Signed-off-by: Clement Leger --- drivers/pinctrl/dw/pinctrl-dwapb.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/pinctrl/dw/pinctrl-dwapb.c b/drivers/pinctrl/dw/pinctrl-dwapb.c index 62e598bdd9ff..3750205408e3 100644 --- a/drivers/pinctrl/dw/pinctrl-dwapb.c +++ b/drivers/pinctrl/dw/pinctrl-dwapb.c @@ -529,7 +529,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, if (pp->has_irq) dwapb_configure_irqs(gpio, port, pp); - err = gpiochip_add_data(&port->gc, port); + err = devm_gpiochip_add_data(gpio->dev, &port->gc, port); if (err) dev_err(gpio->dev, "failed to register gpiochip for port%d\n", port->idx); @@ -543,15 +543,6 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, return err; } -static void dwapb_gpio_unregister(struct dwapb_gpio *gpio) -{ - unsigned int m; - - for (m = 0; m < gpio->nr_ports; ++m) - if (gpio->ports[m].is_registered) - gpiochip_remove(&gpio->ports[m].gc); -} - static struct dwapb_platform_data * dwapb_gpio_get_pdata(struct device *dev) { @@ -719,7 +710,6 @@ static int dwapb_gpio_probe(struct platform_device *pdev) return 0; out_unregister: - dwapb_gpio_unregister(gpio); dwapb_irq_teardown(gpio); clk_disable_unprepare(gpio->clk); @@ -730,7 +720,6 @@ static int dwapb_gpio_remove(struct platform_device *pdev) { struct dwapb_gpio *gpio = platform_get_drvdata(pdev); - dwapb_gpio_unregister(gpio); dwapb_irq_teardown(gpio); reset_control_assert(gpio->rst); clk_disable_unprepare(gpio->clk); -- 2.15.0.276.g89ea799