From patchwork Tue Nov 8 18:11:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frayer X-Patchwork-Id: 17157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2870283wru; Tue, 8 Nov 2022 10:16:16 -0800 (PST) X-Google-Smtp-Source: AMsMyM6nkoL3uNtR4KdGWyVjTMsDvzwy+jPBMw8L+hS8wG0EkJIBVJJQqXW8lFb/blPyWxU/O3SC X-Received: by 2002:a17:90b:3011:b0:213:deb7:d47f with SMTP id hg17-20020a17090b301100b00213deb7d47fmr48996490pjb.136.1667931376180; Tue, 08 Nov 2022 10:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667931376; cv=none; d=google.com; s=arc-20160816; b=dik2mCIufLJVZwKrPMTSmE5/TgG06Tbtsg/hEP7ZHCh/cQphQpdqACEV4ejenXn8+y iadfPpu0fEAXv7Z95+oVEii9/sbT4s1dGwVGjIsqhF9isac3q0w1tF8zjlLQdQD+7rkC ihRc9Pn9iluFJTvL+vgP5IjrwM5Znm1Rb802O4o1R0nL4iJbYJa23AgLOXJqFY4AYZX3 T5LTVtX3k6IyFo6XB866SEvu2hbXmAxCoHzRbk+AG7WtTHvOee0ww9swEtWsX4N/C9rD ZFHD1TMBK80kh9PZ+Ih0M8n7bzEV9SCIJyXQJpqCdEqVywq7YSRc8D4GdftFTO6BdcmV WkjA== 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=1o2x75QMXnEx7W9bo3sYlpr0oxVXvlHN3ieGl1S2FPc=; b=E89jrScdhr5i68efDn7/av0dLJNFCMj2Ut9az1YqNAlq+4tcrGFlKyipRAXQqJG4qW Wx6cK+xqZ/ELF4DQrgwHCoNos5CLMWfM8PrtV5RpU3fQZlT9NPxZS5q0WhJ1FkeCxqCW geF9cTL61XkjswHqkRl+t+3ktCxK+ANz6529jPsDdlo0NXtV07oLlzb0XjuP5YLaZjF2 269FNzplKNzzHDyy9695uhcmb7BP9/a/mEWEPNgB7CmGSMl7+anEfw4sZ4w5YOn7EmLn XHNZxKrRil57CHLyVq5eMqr83hvdrqNheicdE0BIwLWy/XbcJJjBmvFp9Gr358YHMBIN y/uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=ujEcfx2J; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ot3-20020a17090b3b4300b002121890521csi21975819pjb.119.2022.11.08.10.16.02; Tue, 08 Nov 2022 10:16:16 -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=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=ujEcfx2J; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234720AbiKHSMN (ORCPT + 99 others); Tue, 8 Nov 2022 13:12:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234238AbiKHSMA (ORCPT ); Tue, 8 Nov 2022 13:12:00 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78B1F5656F for ; Tue, 8 Nov 2022 10:11:59 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id w14so22261166wru.8 for ; Tue, 08 Nov 2022 10:11:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; 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=1o2x75QMXnEx7W9bo3sYlpr0oxVXvlHN3ieGl1S2FPc=; b=ujEcfx2JBqa8tGPUt5e3C3LQcP1CU3B5jOJvJRtkbqcSjMkGYHWeqnwOke9HxmmCe8 17cBtyAyhYSgh6EsCEbH8p/X0IcSBkasuJTvONH7Z2EKSF34By622568NRHz8VqyvLDm ZxU4G5j7EgRNhQ+f++AUPlEcdbmgsBV2NnXXHOopQLLH2pDmOF9S7YzN5MxHIoup1FQN zwcmouVS7G/4AODBGfinpB7DZAkops9B5eftWRfjesoDnCJKJQ9DkBdW+zagwH6EhiKQ wftR6OF1Pist9ZCelaDTyx8Wu1nAgo+MNtmLpXrO8bxpdBx9uRsOj3gNuAVX43ZO/oMQ +jsg== 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=1o2x75QMXnEx7W9bo3sYlpr0oxVXvlHN3ieGl1S2FPc=; b=3y4car0mFBRQzG7o77W7bg2rdxbIRMUXWVHnHEdHRpuNzxHQzCl76Cy8gChdv7oBfx SeJQX99aZKMGRZYasNCuI2hT0/Wxc6wYyiv8lwTKFf0OoZMFqmhNH8pLcX9+elnLugjN D8M/grKdyx4kmO3KR9YoZ5Yigj9aSU9t26SYqC9BIhg7nhow50e31TfyUrM2+xbt8YYY Pw8Ik31jsKS5mLGjEvWlUFpq9h3vuCF+QXruGdwjfd+huSMFxswIA1PSXA63ic2OoDtY GFM3Edw3CFUFBcPFvRGNV4JFI+rxj9T02olrPEZXqrGzj2uh5ZXi+XH3rftps/0h1yxu lCww== X-Gm-Message-State: ACrzQf1QdnN3REee7560a6O9V1BAk2PA1DnfPgQZb2BzvXS7qls8t3nX /PqsVzkLbJNEAz8BHKOf/z+diQ== X-Received: by 2002:a05:6000:24f:b0:236:76e8:33fd with SMTP id m15-20020a056000024f00b0023676e833fdmr35567148wrz.215.1667931117970; Tue, 08 Nov 2022 10:11:57 -0800 (PST) Received: from nicolas-Precision-3551.home ([2001:861:5180:dcc0:7d10:e9e8:fd9a:2f72]) by smtp.gmail.com with ESMTPSA id q12-20020a5d61cc000000b002238ea5750csm13037109wrv.72.2022.11.08.10.11.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 10:11:57 -0800 (PST) From: Nicolas Frayer To: nm@ti.com, ssantosh@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, peter.ujfalusi@gmail.com, vkoul@kernel.org, dmaengine@vger.kernel.org, grygorii.strashko@ti.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org Cc: khilman@baylibre.com, glaroque@baylibre.com, nfrayer@baylibre.com Subject: [PATCH v4 1/4] soc: ti: Convert allocations to devm Date: Tue, 8 Nov 2022 19:11:41 +0100 Message-Id: <20221108181144.433087-2-nfrayer@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221108181144.433087-1-nfrayer@baylibre.com> References: <20221108181144.433087-1-nfrayer@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,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 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?1748952810684006965?= X-GMAIL-MSGID: =?utf-8?q?1748952810684006965?= Changed the memory and resource allocations in the probe function to devm. Also added a remove callback. Signed-off-by: Nicolas Frayer --- drivers/soc/ti/k3-socinfo.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c index 91f441ee6175..19f3e74f5376 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -96,21 +96,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev) partno_id = (jtag_id & CTRLMMR_WKUP_JTAGID_PARTNO_MASK) >> CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT; - soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) return -ENOMEM; - soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%x.0", variant); - if (!soc_dev_attr->revision) { - ret = -ENOMEM; - goto err; - } + soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "SR%x.0", variant); + if (!soc_dev_attr->revision) + return -ENOMEM; ret = k3_chipinfo_partno_to_names(partno_id, soc_dev_attr); if (ret) { dev_err(dev, "Unknown SoC JTAGID[0x%08X]\n", jtag_id); - ret = -ENODEV; - goto err_free_rev; + return -ENODEV; } node = of_find_node_by_path("/"); @@ -118,22 +115,26 @@ static int k3_chipinfo_probe(struct platform_device *pdev) of_node_put(node); soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR(soc_dev)) { - ret = PTR_ERR(soc_dev); - goto err_free_rev; - } + if (IS_ERR(soc_dev)) + return PTR_ERR(soc_dev); + + platform_set_drvdata(pdev, soc_dev); dev_info(dev, "Family:%s rev:%s JTAGID[0x%08x] Detected\n", soc_dev_attr->family, soc_dev_attr->revision, jtag_id); return 0; +} + +static int k3_chipinfo_remove(struct platform_device *pdev) +{ + struct soc_device *soc_dev = platform_get_drvdata(pdev); -err_free_rev: - kfree(soc_dev_attr->revision); -err: - kfree(soc_dev_attr); - return ret; + if (soc_dev) + soc_device_unregister(soc_dev); + + return 0; } static const struct of_device_id k3_chipinfo_of_match[] = { @@ -147,6 +148,7 @@ static struct platform_driver k3_chipinfo_driver = { .of_match_table = k3_chipinfo_of_match, }, .probe = k3_chipinfo_probe, + .remove = k3_chipinfo_remove, }; static int __init k3_chipinfo_init(void)