From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED1AEC2D0A3 for ; Mon, 26 Oct 2020 14:19:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B41AB21655 for ; Mon, 26 Oct 2020 14:19:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="gh4HzeCC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1781149AbgJZOTK (ORCPT ); Mon, 26 Oct 2020 10:19:10 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43137 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1780574AbgJZOTB (ORCPT ); Mon, 26 Oct 2020 10:19:01 -0400 Received: by mail-wr1-f66.google.com with SMTP id g12so12784487wrp.10 for ; Mon, 26 Oct 2020 07:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zNlfGqR+PgAe0QneJuZnZZA8sj+er/tRH9Y2OabUbQ0=; b=gh4HzeCCQLfL5jHFIUm26UdGLVfvp3opWY/OVkpIQohdrvtI3hdU8aERlCPcZ3dOvE f1zOUGsmlti2vWFn/1wF5rhe74W9kraydJuqtvjm7vvJubXDuKFINX3Dpek4SVfCUBjh udZ2K96ZTuXt+h/iOnMJV6/Eahh/jafnEweDc/eHnfDK0V0yEbC/V3k9M5YuS9cOBz13 2GuWQPyRw36d12wY22Os7QVDUPrldvVBSeSPNc0auOOW3d3O7RHXaFz/6Cp5i9+5DTiv Y3NVheSPaAvC1fSkLSvoq69gnZSD4jrW5jEsVHAeGIZ32/GJex7HvS50vHIXC4TXLv1H v7Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zNlfGqR+PgAe0QneJuZnZZA8sj+er/tRH9Y2OabUbQ0=; b=bHMwcKgyHdt//TQMEcKxFrS2UCIAnlD46sM8c+cvBbko0OeUCBgHDYsVH0pAsVBL0K GZgaAEInmk2iLTd7uAwmsoqKPqlMKZkKHM0+4FKIx53g/i9d5lpxaOSZwrFiV8NUG6r8 BagGH6+5eDZXPwSIc0VRWMvdGrWPZDhM4LswVomYbbtNe+5yvFGRf850QwYPZ7sU+I4E Ox4o8c9v53ceQhtfglgNcus/S4OWJuJCb5+tDEAIaGv80WJU4ZGQ4SaPP8pOv5nGCiOF ajVC4SP13eo7rgVcaiXjOKw5iC5jYYNAvGyXWel3iYzd15+Bbis6fBoiW4qkMIpR04F3 lzwQ== X-Gm-Message-State: AOAM533LQ54fvIlgP7emnjqovFXaQHZZLX5EQW1OKRV9yhbBiHE1P9wq alh8d4sqhET1ZUGJsRwHypcGy259g0NqcA== X-Google-Smtp-Source: ABdhPJyjVcdemCo73EyobrFHZh8UvBBGsFPmk5fAb9DNhV+vH0yKvtXmZog+D8tGQZw2qD+6tmnEUg== X-Received: by 2002:a5d:4648:: with SMTP id j8mr17852406wrs.131.1603721937895; Mon, 26 Oct 2020 07:18:57 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id e15sm21920841wro.13.2020.10.26.07.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 07:18:57 -0700 (PDT) From: Bartosz Golaszewski To: Sudip Mukherjee , Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 7/7] gpio: exar: use devm action for freeing the IDA and drop remove() Date: Mon, 26 Oct 2020 15:18:39 +0100 Message-Id: <20201026141839.28536-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201026141839.28536-1-brgl@bgdev.pl> References: <20201026141839.28536-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski We can simplify the error path in probe() and drop remove() entirely if we provide a devm action for freeing the device ID. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-exar.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c index e4da278f74a2..fda9346d1dc0 100644 --- a/drivers/gpio/gpio-exar.c +++ b/drivers/gpio/gpio-exar.c @@ -110,6 +110,13 @@ static int exar_direction_input(struct gpio_chip *chip, unsigned int offset) return 0; } +static void exar_devm_ida_free(void *data) +{ + struct exar_gpio_chip *exar_gpio = data; + + ida_free(&ida_index, exar_gpio->index); +} + static const struct regmap_config exar_regmap_config = { .name = "exar-gpio", .reg_bits = 8, @@ -157,6 +164,10 @@ static int gpio_exar_probe(struct platform_device *pdev) if (index < 0) return index; + ret = devm_add_action_or_reset(dev, exar_devm_ida_free, exar_gpio); + if (ret) + return ret; + sprintf(exar_gpio->name, "exar_gpio%d", index); exar_gpio->gpio_chip.label = exar_gpio->name; exar_gpio->gpio_chip.parent = dev; @@ -173,29 +184,15 @@ static int gpio_exar_probe(struct platform_device *pdev) ret = devm_gpiochip_add_data(dev, &exar_gpio->gpio_chip, exar_gpio); if (ret) - goto err_destroy; + return ret; platform_set_drvdata(pdev, exar_gpio); - return 0; - -err_destroy: - ida_free(&ida_index, index); - return ret; -} - -static int gpio_exar_remove(struct platform_device *pdev) -{ - struct exar_gpio_chip *exar_gpio = platform_get_drvdata(pdev); - - ida_free(&ida_index, exar_gpio->index); - return 0; } static struct platform_driver gpio_exar_driver = { .probe = gpio_exar_probe, - .remove = gpio_exar_remove, .driver = { .name = DRIVER_NAME, }, -- 2.29.1