From patchwork Mon Nov 20 22:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 167415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp255597vqb; Mon, 20 Nov 2023 14:28:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvFuZ8fPi38AD52SjT8R094Sze4q8IrdJScDP4J7fnQoRtG7qm+5IyonUVmT7sXhk282Sx X-Received: by 2002:a17:903:22c1:b0:1ce:67fa:b380 with SMTP id y1-20020a17090322c100b001ce67fab380mr1137691plg.34.1700519329172; Mon, 20 Nov 2023 14:28:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700519329; cv=none; d=google.com; s=arc-20160816; b=wL9zveNZ5480Zi/sXU0OYYw92EFoVmtjw4XUNr25VsqIKFzVBwzEbxL4JyJTBA27tE oLDdvEngx9l2afXVYahFax9S/lyRdHYe+99mhZ/g4RGUdhDB4IsqSVBojeaZ/UZW9KQs r7S3+hn9K8L0sIWDDu6Aio5hzG/6cSoge30WO/NJCShE/yhFFWUMU7khZLomOUo12Cu7 QgPmY/BJBQMhU9NarXr5yqhh+AuQ4N7QYRwEtINcOyJBNh0VEzfthILgoVIaMu4AnK1g rVGMat7MuMkHTUXzpIgJtLVW/sRCra7tK3BLfn0H8cOFTebOcD8Xx/AcsLfZ7uKQe+ox xGWA== 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=le1DTxFwJBwSLVczHlEbJ1qmGMhisFi+cnB/Mpt44S4=; fh=HQQk3d4NoxI9SpUlktd+4fu8zJW7NOgR72W71jUdFhg=; b=B/HCNdqi0OqV1Mt1lo03tBpG2klCX/OunzBb1D/OfJPxPwB7GwZcthFKAzsLlQn01U +O7LKtPFnZ2B97G/a1ILtYXq3ms15yr8fAC/JuQQd6WXH+kB4x6Ak9B6+2NRR30kxSGw wCNovnfbJZqCpKh+PCG24zODNnD0ORc5+fdMcwW1GMskfKUOZ2A8aOydcSdgADKIVxNZ lS1e2VEykQYUloGTmyhxPm3O2eBtx+GbLcseLc/KPrSQOmKOHSZt12f0/+tG5C3bwAwC YPxvjUWLtt7Xq6kJmugtMRQFKFoFnZqyLFo7vi1cyiUIv5yXpei+jDRi8KtIm+xCe0S0 6YQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EBiHsOdD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 11-20020a170902c14b00b001cc0e39373bsi8599660plj.32.2023.11.20.14.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 14:28:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EBiHsOdD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3FDCF80941E7; Mon, 20 Nov 2023 14:28:48 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232552AbjKTW2o (ORCPT + 27 others); Mon, 20 Nov 2023 17:28:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229952AbjKTW2m (ORCPT ); Mon, 20 Nov 2023 17:28:42 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3161497 for ; Mon, 20 Nov 2023 14:28:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2BF6C433C7; Mon, 20 Nov 2023 22:28:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700519318; bh=bXCpdr2eVuRieBZCu88Dpd9XKIAOtGduXyMB0bsi/HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EBiHsOdD3KFE8GxtQyGOtwJhdbYDQjLSx0xBZSXl51cmJVzogfiMVkEyyP7PPpEO9 xWHVCPPxW1dHmLOjzgmKL2NC7B979wXZ6sOxh+wbDp1Hv/EdERIH/fq7cjjx3xHBsK rwGI1ixxwnCkJxpxkzgwy35DIlR9IC2mHrJTFmrrrGQxiid4BJ+yViM59Y5/UVWlGd pTKP3Rs4G0oWgvOHuG0e/X++HLOyGqN+2VW5b3MRH0Lvm8rcTAZUFA27650gv0fagv ut/siDNbDzj217yHO+Nlosn++OjCQWQMIlT1e4oY7mfnFX8BRxv3nxK96WL/OWzazz 4/zqjeRsj5rxA== From: Masahiro Yamada To: Linus Walleij , Bartosz Golaszewski , linux-gpio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 1/2] pinctrl: pinconf-generic: resize the pin config array directly Date: Tue, 21 Nov 2023 07:28:31 +0900 Message-Id: <20231120222832.4063882-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231120222832.4063882-1-masahiroy@kernel.org> References: <20231120222832.4063882-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 14:28:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783123755917952797 X-GMAIL-MSGID: 1783123755917952797 pinconf_generic_parse_dt_config() allocates memory that is large enough to contain all the config parameters. Then, kmemdup() copies the found configs to the memory with the exact size. There is no need to allocate memory twice; you can directly resize the initial memory using krealloc_array(). I also changed kcalloc() to kmalloc_array() to keep the consistency with krealloc_array(). This change has no impact because you do not need to zero out the 'cfg' array. Signed-off-by: Masahiro Yamada --- drivers/pinctrl/pinconf-generic.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index 8313cb5f3b3c..ba4fe2466e78 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c @@ -247,7 +247,6 @@ int pinconf_generic_parse_dt_config(struct device_node *np, { unsigned long *cfg; unsigned int max_cfg, ncfg = 0; - int ret; if (!np) return -EINVAL; @@ -256,7 +255,7 @@ int pinconf_generic_parse_dt_config(struct device_node *np, max_cfg = ARRAY_SIZE(dt_params); if (pctldev) max_cfg += pctldev->desc->num_custom_params; - cfg = kcalloc(max_cfg, sizeof(*cfg), GFP_KERNEL); + cfg = kmalloc_array(max_cfg, sizeof(*cfg), GFP_KERNEL); if (!cfg) return -ENOMEM; @@ -266,30 +265,22 @@ int pinconf_generic_parse_dt_config(struct device_node *np, parse_dt_cfg(np, pctldev->desc->custom_params, pctldev->desc->num_custom_params, cfg, &ncfg); - ret = 0; - /* no configs found at all */ if (ncfg == 0) { + kfree(cfg); *configs = NULL; *nconfigs = 0; - goto out; + return 0; } - /* - * Now limit the number of configs to the real number of - * found properties. - */ - *configs = kmemdup(cfg, ncfg * sizeof(unsigned long), GFP_KERNEL); - if (!*configs) { - ret = -ENOMEM; - goto out; - } + /* Now resize the array to store the real number of found properties. */ + *configs = krealloc_array(cfg, ncfg, sizeof(unsigned long), GFP_KERNEL); + if (!*configs) + return -ENOMEM; *nconfigs = ncfg; -out: - kfree(cfg); - return ret; + return 0; } EXPORT_SYMBOL_GPL(pinconf_generic_parse_dt_config); From patchwork Mon Nov 20 22:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 167416 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp255638vqb; Mon, 20 Nov 2023 14:28:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyYxtV1VEA2JORFLdFp1Wyz9Q8Z5hZ5xaRq8Gg6uQXf+C9sbWrY+Qa74fTFbKuVHWS47mu X-Received: by 2002:a05:6a00:1912:b0:6c4:db03:d20f with SMTP id y18-20020a056a00191200b006c4db03d20fmr11723572pfi.17.1700519335950; Mon, 20 Nov 2023 14:28:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700519335; cv=none; d=google.com; s=arc-20160816; b=JC5GzZJ5xG0OFiumWJBeHH9aldy3xaqFm8NwmVGTYIw2yKrnP0QaY+T2bjzmAwK8P4 kjzGqPHF+x2SWSMeSZBBIHvFaHjzjFLznzd5fsxXBJWDujAM/86wyejTMxq4bFo9y0Nw xGbZteAS5tU83nWm+WeohOHulNqrOGnw3XHRzXpPMSRfyJG8YG2+wb1+D8nwUVLzfvBR FFQ9nNGm6tax2ebWhTsSIdEUcLwEVb+7FHekQo03rcZXODtd7eO7WjX3KvvzUSZe2IuR WHJXA5rhdYE2u6Yn83NtFWFsVoMiMcOQs7v0dz/CpHoBhBbwVJqcX7e7P4hHTtPP3JSz bFWg== 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=gX/SjJOpCJYCeQ+0Y6gb03+A86/1jzmynaxqby2BgAo=; fh=HQQk3d4NoxI9SpUlktd+4fu8zJW7NOgR72W71jUdFhg=; b=zz7lNIYa+QC4vUlCZ0Ve6QDBkEfUwwCZW8vbcqmRCcJqUuaQs7oYV1KP3lRyVTM4L3 3Cz7Cq2bEbVT7gChmcERysovGVudMbrV4e820BckV7bNt7rskiAMG9JJKmDHZmwmaYcw Ug2z4epcNr04PabnWGPjKETtZDnBL0EHtp2Xxjs8qqWcIxSgE+um+NmehP/8PO0xJfsb /b5LzY1w0ISZLOvwjpUCZutUCIvhgt6I6K2/h3h3mVQ6+6ggkZhlE4HAPAbbQ/WAcnz8 kcvzBXiqn5T8wKEMvjQmnJRVxOD/DC/mu01mpYVr/1MmZyIfm5KR3/crjrNHe60gevZU D4gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nJEQgwWO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cl22-20020a056a02099600b005c1ce3c9609si9789320pgb.889.2023.11.20.14.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 14:28:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nJEQgwWO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D452D80941E7; Mon, 20 Nov 2023 14:28:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229902AbjKTW2p (ORCPT + 27 others); Mon, 20 Nov 2023 17:28:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232539AbjKTW2n (ORCPT ); Mon, 20 Nov 2023 17:28:43 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87CCD97 for ; Mon, 20 Nov 2023 14:28:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 402C8C433CA; Mon, 20 Nov 2023 22:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700519320; bh=lm7/gVjjO8J4rGGfH0O5RParZfMnIY0MkOc5Mwd5oTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJEQgwWOw+C7D8EhdvrVMZGCGeW51hRnSqEgzzkovWfmgQZMVejOyWW90TicHb9cR gSuTbi++TH6DeMRHW/0c5TzfwIwNeGFQI1O05cgt+tppgBXm5jGFvRdjVgl7CEQPSG j34REcfh1n/ag9wx3CAbciOYaMpeSuTe626Yp/Sb2pNWrJWSJBYXuFiwTDY4NGDxjh I/i0WB+FRhUzRsrM2jO4NFPJpU4YMC2hdETD5U/ddBm1Ld6E0JV0RSvHSttknPFIbs /rxAFZzE2O7NnLymcPwM08tbl4uXprn6CswuwexRlXliDejuQl35/tfySjABuERuhH KRpgUP7nAUk3A== From: Masahiro Yamada To: Linus Walleij , Bartosz Golaszewski , linux-gpio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 2/2] pinctrl: pinconf-generic: remove the special handling for no config case Date: Tue, 21 Nov 2023 07:28:32 +0900 Message-Id: <20231120222832.4063882-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231120222832.4063882-1-masahiroy@kernel.org> References: <20231120222832.4063882-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 14:28:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783123763527741790 X-GMAIL-MSGID: 1783123763527741790 To further simplify pinconf_generic_parse_dt_config(), eliminate the handling of the case where no configuration is found. When ncfg is zero, krealloc_array() will set ZERO_SIZE_PTR to *configs, which is a natural approach for managing a zero-size buffer. This should have no impact because none of the callers accesses 'configs' when ncfg is zero. Also, it is safe to pass ZERO_SIZE_PTR to kfree(). Signed-off-by: Masahiro Yamada --- drivers/pinctrl/pinconf-generic.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index ba4fe2466e78..252d69ee2b68 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c @@ -265,14 +265,6 @@ int pinconf_generic_parse_dt_config(struct device_node *np, parse_dt_cfg(np, pctldev->desc->custom_params, pctldev->desc->num_custom_params, cfg, &ncfg); - /* no configs found at all */ - if (ncfg == 0) { - kfree(cfg); - *configs = NULL; - *nconfigs = 0; - return 0; - } - /* Now resize the array to store the real number of found properties. */ *configs = krealloc_array(cfg, ncfg, sizeof(unsigned long), GFP_KERNEL); if (!*configs)