From patchwork Mon Feb 6 13:43:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 53244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2242302wrn; Mon, 6 Feb 2023 05:46:04 -0800 (PST) X-Google-Smtp-Source: AK7set/tEgD4P8d/sRDSP6034GOkjVtsCjBmsSr+sAla4BXqF08GnnlcZ0TONp8kHy/A9qbh0HDx X-Received: by 2002:a17:906:c213:b0:878:81d9:63ea with SMTP id d19-20020a170906c21300b0087881d963eamr20240770ejz.52.1675691164134; Mon, 06 Feb 2023 05:46:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675691164; cv=none; d=google.com; s=arc-20160816; b=wMi8Bg0vg+vtc9hdx+bQhBM6xup+HKigXuhtPgig7FSC9I/mdmp3i3cQXe0YV08ALj I5vZebw9pBnCr/1afvxRwnYfgNoaM8gJGmeUyfyxoXCWCX6RQ2yhdiB9MWnxV0ntQQjx lq88g5kIOr3Ewk9TpCGBBFvesGC5DFwO6db4mKE9F1sX0xYwVA+XFTOPRc5WeYWwQe2K LkAiZAtLcOf/tNzrx65U6rg6u6tVUNOK0D5GbbQVHCSCDa+gO07MogP4hupE7HXAZ28Y Q/cEop5/BY7EgZcPif/UaEi/G2NvbKwbZXnkkFkx/QkqYXOQk4iDyljdIDk++qnrIt4X 16HQ== 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=IgWqiYoy7iTVqZHJ21rDyJ80SvbTnPhWOGsjkHQz9g4=; b=zOe+07y6b5bp3kXrP91njAoDXs7CGtDTRTsB33VOqPSHhL35VidbEPz20dg3A1uvLu K31vq73OE3WJmv7SnK5qiyRwdbi0D6OWKa9yY3i6eCwv4/RAblF3htpk9PIhRghZdRNy Iqf7f4df0lB7FGOQt1cg1axMcuZ5lXzn8Us9fU4gneX7jN+y+ztJipS2NqcDknzGqgD0 YMj+xREfrZiQ+F1o0icdOdu6fgJQX1DSpji6+EW+tPv8vp5DvinA9LnvbKnQnHhVfBYE G6jffbQ8Y8UOuuu3G9KMZr3m3LRGlX3xNSLdQCtQpwcqENY6KdlNLhR0EIQC4KFYyHmv 3WrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PPkL9u4s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id uj29-20020a170907c99d00b0088d5dc62a29si12470926ejc.200.2023.02.06.05.45.41; Mon, 06 Feb 2023 05:46:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PPkL9u4s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbjBFNpR (ORCPT + 99 others); Mon, 6 Feb 2023 08:45:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230280AbjBFNov (ORCPT ); Mon, 6 Feb 2023 08:44:51 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C05B1265BA for ; Mon, 6 Feb 2023 05:44:25 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id h3so2566249wrp.10 for ; Mon, 06 Feb 2023 05:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IgWqiYoy7iTVqZHJ21rDyJ80SvbTnPhWOGsjkHQz9g4=; b=PPkL9u4sZCnSnIkNubHB3J6EUGYeSot5ohz3PKnJt87QXfJRvUwyyTUcdo2RTzN5/p TVH/p7NnTGsbK07S5XIGDTlr5DukYyBOo5XSEPfVTcCKKez7owdB6ZAcOw/8XgPukzHW QM7+VE/4olxW4D0PvA8+rUEksKLHc8WFKy9x554fpszgQrUe8gJrKswJLpzhXWSSkuz6 y+Rxjfj0fxPjx/y+aqEdplfeSdnaynqoemj2bOqcTzlEW7Bz0CJV3BA7CrBdNtN4WaW/ PLaoiTQD96CZPBBC0q62b3fdG5OLdmiuO/XOYc5ZLiyMVNZs7llqvRzc8tqG2S1qX7+7 5EdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IgWqiYoy7iTVqZHJ21rDyJ80SvbTnPhWOGsjkHQz9g4=; b=qV6N84o9sKSz/+ARKwBax/hKXKw2cCDidk9mOvI5zxDbn4OVnYqZXE9hBmhxLGFTz9 5Oj58+FWSBFKCKaEMPbSVVnNiS0Rn2E/FCAU+f2H5JZRjV4yqqMw2WMHhlcYISUe2Iag bWBF0DJ4DcfkOI5P015yJTFt6HX6UfHaxmegpJlN/0Mztm7+rAQD3lRC9wjazmMIRY93 0pOcPO4eRLZUnyfqcnPFnn/i11ql8YquYZmIIlnsHAEjPRcgS/ltJBCH5Rx+VVojWR6w CO6ChG6ZmPwSqdh0wXP+RcwCAZ/04vvZ9f05Zbx5QF0Pj7QnNlQmARtGacMRNPY0+llU IB2g== X-Gm-Message-State: AO0yUKWQyFCgGKkPPvGqwhfSLINy3VHERFl5G4xFNIUDvHuTYjv8eHcR k7RSqdcdsxX2Oaq2ZR2WwOk0yQ== X-Received: by 2002:a5d:6b89:0:b0:2bf:ef3b:d072 with SMTP id n9-20020a5d6b89000000b002bfef3bd072mr16782532wrx.0.1675691063825; Mon, 06 Feb 2023 05:44:23 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o15-20020adfa10f000000b002bddaea7a0bsm9008037wro.57.2023.02.06.05.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 05:44:23 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Michael Walle , Srinivas Kandagatla Subject: [PATCH v2 14/22] nvmem: core: drop the removal of the cells in nvmem_add_cells() Date: Mon, 6 Feb 2023 13:43:48 +0000 Message-Id: <20230206134356.839737-15-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206134356.839737-1-srinivas.kandagatla@linaro.org> References: <20230206134356.839737-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757089538073554524?= X-GMAIL-MSGID: =?utf-8?q?1757089538073554524?= From: Michael Walle If nvmem_add_cells() fails, the whole nvmem_register() will fail and the cells will then be removed anyway. This is a preparation to introduce a nvmem_add_one_cell() which can then be used by nvmem_add_cells(). This is then the same to what nvmem_add_cells_from_table() and nvmem_add_cells_from_of() do. Signed-off-by: Michael Walle Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 30567dd51fba..98ae70695f36 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -515,7 +515,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem, int ncells) { struct nvmem_cell_entry **cells; - int i, rval; + int i, rval = 0; cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL); if (!cells) @@ -525,28 +525,22 @@ static int nvmem_add_cells(struct nvmem_device *nvmem, cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL); if (!cells[i]) { rval = -ENOMEM; - goto err; + goto out; } rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, &info[i], cells[i]); if (rval) { kfree(cells[i]); - goto err; + goto out; } nvmem_cell_entry_add(cells[i]); } +out: /* remove tmp array */ kfree(cells); - return 0; -err: - while (i--) - nvmem_cell_entry_drop(cells[i]); - - kfree(cells); - return rval; }