Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp2289521rdh; Tue, 26 Sep 2023 20:11:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgyAWb89STM8BDJ4w1vyJD10slr4YZOV+O1eRrOLNsP7EG605YQBnzeEYBy7g8n36oGZHP X-Received: by 2002:a17:902:ef96:b0:1c6:b83:4720 with SMTP id iz22-20020a170902ef9600b001c60b834720mr557607plb.63.1695784304602; Tue, 26 Sep 2023 20:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695784304; cv=none; d=google.com; s=arc-20160816; b=AqeJ/uI1ndUz+KAWmNzwZjgKnvxJDRy5S7Y9fPX0lgRyQsHeVRwrowYuBp09SEXJCF P1gZx2/9BE9/RAUMuR240l5kxn1FvcTEEyqrk+4IYIMESCoh69mKyxPQpIVHKvgM6//7 lg0IuxVFqXqyj296muIfl9+Vqx9OL+mYJj/fGMTVul5mk5i0ZeeOzmMpHFPxBPARu7jS zS9l4DXRY389UIFYwhjStZphQeOUQdUFmi/ap938mjpTUgN7RbqF+49aBIJheNPdGM0P YPhOAG7EfBMr/mvfCjdMybGN0y90uB4OAhCdqNDuVVsWv53T7WORNne/GKgTjdgHNQ1K cG/A== 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 :dkim-signature; bh=H5TVDvqJs8qAc+LLv1HRgdG1KHLA8XTiKzSBBphxvqk=; fh=KU9Wc9jpoip4EhOZ3v0VLrD400q5bd1dQqQ5HQV6eJs=; b=WqvqTZAn4CuwErzZMJ/exD6TX/h7YJlY07ECz5r/+LrLysrjv0L/vQ/UL2UnqOL85r t7ZqfsVmNe8q3OdRJ79qezqKDmHNv7yRcviThlPmnxzg69VcPQvpuINgj17VN1joS96E V3Eb+JQ64TnWGyYZW/D8Vl8gJl6cJuLuvt1k+KYUfTSZiH7d8q31E/NJYjRKQ0pYCSVE QyQISVyY+mQAqVttBGPNRAaoP/NeQ5cS36o9cmOeD38FCzfqt2diGoQRJnCvSzq7L/5Y Kuifg2lZr5AYKDxx2Ojoj0YTQbPvgwGb/aUo7xkHld5Y8W2EN7H43/fJGFIbPxuvNT6J ApGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aCdntd0t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id ay6-20020a1709028b8600b001c465e1e219si13682514plb.30.2023.09.26.20.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 20:11:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aCdntd0t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5E0738096FCA; Tue, 26 Sep 2023 11:46:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235589AbjIZSpy (ORCPT + 99 others); Tue, 26 Sep 2023 14:45:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235576AbjIZSpv (ORCPT ); Tue, 26 Sep 2023 14:45:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB4B911F; Tue, 26 Sep 2023 11:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695753943; x=1727289943; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UsIV3Q3gcUAc21rNqcq+g99sj4f1HzfeIQJnfu00KFE=; b=aCdntd0tivFkxDS9b5DH2iVc0G0cRPyBa8PhfEFalxHJkRknJ5s0gvjx img5RTQhfHysyg8Y+wmEj9UyN6iHsiW0XpyfuSuoOvjBBp9mTdtcFzeb0 Ko182z3tkAMKVCsQsGYA5zFJBq/0Gv/VK/AHQzlU9d4mU2a71n+wV8Xcw I0cTdD8iQhtzR93tDdCbUqch1Nh61YXlgM+WclLFInaelnpXOwzWzvGbP HCYGD4OPy3zPOZlsnKnOwUpV9VkFpWHNfhMZEaji1MVAe6fyPLpNYs/B/ 1Xfzg0rsGxZJTO/PbU0AT78JBSqLfhXC67hu4qgXw+qiKj0RhtKauTabR w==; X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="378920271" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="378920271" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 11:45:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="752279646" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="752279646" Received: from powerlab.fi.intel.com ([10.237.71.25]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 11:45:34 -0700 From: Michal Wilczynski To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev Cc: rafael.j.wysocki@intel.com, andriy.shevchenko@intel.com, lenb@kernel.org, dan.j.williams@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, Michal Wilczynski , Dave Jiang , Andy Shevchenko Subject: [PATCH v1 2/2] ACPI: NFIT: Use modern scope based rollback Date: Tue, 26 Sep 2023 21:45:20 +0300 Message-ID: <20230926184520.2239723-3-michal.wilczynski@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230926184520.2239723-1-michal.wilczynski@intel.com> References: <20230926184520.2239723-1-michal.wilczynski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 26 Sep 2023 11:46:16 -0700 (PDT) Change rollback in acpi_nfit_init_interleave_set() to use modern scope based attribute __free(). This is similar to C++ RAII and is a preferred way for handling local memory allocations. Suggested-by: Dave Jiang Suggested-by: Andy Shevchenko Signed-off-by: Michal Wilczynski --- drivers/acpi/nfit/core.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 78f0f855c4de..079bd663495f 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -2257,29 +2257,23 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc, struct nd_region_desc *ndr_desc, struct acpi_nfit_system_address *spa) { + u16 nr = ndr_desc->num_mappings; + struct nfit_set_info2 *info2 __free(kfree) = + kcalloc(nr, sizeof(*info2), GFP_KERNEL); + struct nfit_set_info *info __free(kfree) = + kcalloc(nr, sizeof(*info), GFP_KERNEL); struct device *dev = acpi_desc->dev; struct nd_interleave_set *nd_set; - u16 nr = ndr_desc->num_mappings; - struct nfit_set_info2 *info2; - struct nfit_set_info *info; - int err = 0; int i; + if (!info || !info2) + return -ENOMEM; + nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL); if (!nd_set) return -ENOMEM; import_guid(&nd_set->type_guid, spa->range_guid); - info = kcalloc(nr, sizeof(*info), GFP_KERNEL); - if (!info) - return -ENOMEM; - - info2 = kcalloc(nr, sizeof(*info2), GFP_KERNEL); - if (!info2) { - err = -ENOMEM; - goto free_info; - } - for (i = 0; i < nr; i++) { struct nd_mapping_desc *mapping = &ndr_desc->mapping[i]; struct nvdimm *nvdimm = mapping->nvdimm; @@ -2292,8 +2286,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc, if (!memdev || !nfit_mem->dcr) { dev_err(dev, "%s: failed to find DCR\n", __func__); - err = -ENODEV; - goto free_info2; + return -ENODEV; } map->region_offset = memdev->region_offset; @@ -2342,12 +2335,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc, ndr_desc->nd_set = nd_set; -free_info2: - kfree(info2); -free_info: - kfree(info); - - return err; + return 0; } static int ars_get_cap(struct acpi_nfit_desc *acpi_desc, -- 2.41.0