From patchwork Sun Aug 25 13:50:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13776776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A041BC5320E for ; Sun, 25 Aug 2024 13:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=EF9Qqgl26owRqH1FstKdyvbEmMtUlay6Jv/0hyaG+ok=; b=BYo6Rxb4rO6ocLDWSwB/ynmbzw uIuxscTNIch5Co2BXmVBHyc0bG+B80HLLOuJ6C91vL2o8E+L58chcuaiYEirDpwV0b4JVqk5YAzsU a7hYVznGxAYSEarEVGaoh2AJKBiNYbfTPBJx/Lcgvh+stx0bqTcTXoSEDs3JSMjEgamkNJp/Wd6yQ XSLRkd0A3iDxCv40B9YtT43b0Jw0xKpIkBKm1JxElvsoUvUe9ci5xXOWQIp/SqJ0okm6Y81kUyXjF 1exZfK+uUeAD011dWUSzbAXIiLSyV2VSsnnzs1FIpkWGA6GVAUn1uk+0o41oXCvvPkBVy3ZQ4pgTi 8q6bgy5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1siDdv-00000004QN3-1qg7; Sun, 25 Aug 2024 13:50:55 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1siDd9-00000004QFE-1nyT for linux-arm-kernel@lists.infradead.org; Sun, 25 Aug 2024 13:50:09 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4281e715904so3932345e9.0 for ; Sun, 25 Aug 2024 06:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724593805; x=1725198605; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EF9Qqgl26owRqH1FstKdyvbEmMtUlay6Jv/0hyaG+ok=; b=WtTTemMtA88v7WVzUd0ZaUzLrPDbV29upDXGHP9BMlOszE3hy2POnJPrO/Vo0jTN52 mJxYkD0tR1lCybtylL3snNksveZZlURQzFPZ9dqM4gz2W/bs54Px3E+NOzEgbuOKgFyd 475QNMsgztLyKeR5uyvYAWwRkRbyQhe2cDegrTNv4utQI9zBID/8DKrYGDGpXU1Fnvrr rNFFA5rHQXCQgI41t6aUVONTSTjE8HVOmQd4/Wx+wY+b+0Ux79pda0jCD16WuNXWA44o jw/JELkfMN+xoGuYX6QWI+UwOCql/wvRFrltDt82Ia5hE8PN6Z0gbn6Ubq0A4VL1f9qN hMxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724593805; x=1725198605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EF9Qqgl26owRqH1FstKdyvbEmMtUlay6Jv/0hyaG+ok=; b=Fxg/t2/eEkub+xU+7k7Jo76Fxn2Ckt0s43NDk57RYQhdqfnbgYeS7WFfmVZBayjgAT UiR1vYHU6baIXlFg/DFcJJw1o0t03qLtCCG4CVJ7rbxI2K2+iQwGW6aUitsTeSG++XhG HoJc96kc2pMIix3jGqg5WfWUxKgUa+OipwE83vvz/d6fG7B8pleZXZVARh2k0Q5lVT1N Q4sBFMUU+XRx2gieT+xEQV+E1PW00YaWJ0N7fM8Ek3/j9rSnHyVfQQLvxo1YTR1M9g7g tHeBfTGSY/Bn/t5/jBpgIcslcFRAvSqMDwZBOLT9gj03P7iWmYYTrkWa3XKm59Sc5zJ9 lQ3Q== X-Forwarded-Encrypted: i=1; AJvYcCWWfgR5eNc93AcCHB+8/tZo7OI9z0J0JGks0IuHYHeyBIyFwbD7e2q4FQgdQZhpMd/NQ+MqkxalrxPlvKuJGwZs@lists.infradead.org X-Gm-Message-State: AOJu0YzjXfH/UfHO2tqYN6JqFxnbH/twG9yg47CM7HAJnP9qgAvC+OmL ZTJ3J6H6eMoOpQLt6CaHC+6E2eWxZ8wefYK/HTSlbbJYboZHuTtea70GdPJR2uA= X-Google-Smtp-Source: AGHT+IGnENfrPvjukEnSzPjhx2HARE0cEYrdN08tvFIdvbOIg83EEt5QK6KAQ4UxwiIxW/204HD2Vg== X-Received: by 2002:a05:600c:3b90:b0:426:5dd5:f245 with SMTP id 5b1f17b1804b1-42acc8dedbfmr32194235e9.2.1724593805455; Sun, 25 Aug 2024 06:50:05 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac514e1f7sm122188365e9.5.2024.08.25.06.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 06:50:05 -0700 (PDT) From: Krzysztof Kozlowski To: Vladimir Zapolskiy , Krzysztof Kozlowski , Miquel Raynal , Michal Simek , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Jonathan Cameron Subject: [PATCH 1/2] memory: pl172: simplify releasing AMBA regions with devm Date: Sun, 25 Aug 2024 15:50:00 +0200 Message-ID: <20240825135001.48963-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240825_065007_526109_AD485027 X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use devm_add_action_or_reset() and dev_err_probe() to make the probe() error handling simpler around amba_release_regions() cleanup. This allows to drop the remove() callback entirely. Suggested-by: Jonathan Cameron Signed-off-by: Krzysztof Kozlowski Acked-by: Vladimir Zapolskiy Reviewed-by: Vladimir Zapolskiy --- drivers/memory/pl172.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/memory/pl172.c b/drivers/memory/pl172.c index db5fbee34077..be7ba599cccf 100644 --- a/drivers/memory/pl172.c +++ b/drivers/memory/pl172.c @@ -187,6 +187,13 @@ static int pl172_parse_cs_config(struct amba_device *adev, return -EINVAL; } +static void pl172_amba_release_regions(void *data) +{ + struct amba_device *adev = data; + + amba_release_regions(adev); +} + static const char * const pl172_revisions[] = {"r1", "r2", "r2p3", "r2p4"}; static const char * const pl175_revisions[] = {"r1"}; static const char * const pl176_revisions[] = {"r0"}; @@ -232,13 +239,14 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id) return ret; } + ret = devm_add_action_or_reset(dev, pl172_amba_release_regions, adev); + if (ret) + return ret; + pl172->base = devm_ioremap(dev, adev->res.start, resource_size(&adev->res)); - if (!pl172->base) { - dev_err(dev, "ioremap failed\n"); - ret = -ENOMEM; - goto err_no_ioremap; - } + if (!pl172->base) + return dev_err_probe(dev, -ENOMEM, "ioremap failed\n"); amba_set_drvdata(adev, pl172); @@ -256,15 +264,6 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id) } return 0; - -err_no_ioremap: - amba_release_regions(adev); - return ret; -} - -static void pl172_remove(struct amba_device *adev) -{ - amba_release_regions(adev); } static const struct amba_id pl172_ids[] = { @@ -292,7 +291,6 @@ static struct amba_driver pl172_driver = { .name = "memory-pl172", }, .probe = pl172_probe, - .remove = pl172_remove, .id_table = pl172_ids, }; module_amba_driver(pl172_driver);