From patchwork Fri Oct 21 13:47:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frayer X-Patchwork-Id: 13014862 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 5C358C4332F for ; Fri, 21 Oct 2022 13:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8VW1inV2mttvFCIcNpiM667GTK88mP0uuy2bkwpji1w=; b=EPtwd4PzrPVSv6 kjmZ+UPwrE7hEZe7euMz9ymlpsNM3gDRUIWJRCi16UKoGmG4f/bT4yGnpMa8kcNrdgxukSFiph5FJ qm2jSK8oYLKL5tcsz+Q6MesLbcX+TA8nZp0BJVQMMAeeBUcWMmlPNXyjuUZmqKF51dF7+KfOT7Zx7 pDUyleR36t7fxBd8yXkVtddThFwjeNjtVJXfhEdT29v+VzRe0slXfgFguDyJvf99LFJw3vGTELfrA ++5GZm6EqmNwoD1SAnpIoXePZk55uaF5A1aE//bFhhXvfGBxcJGKT0joWCJdddTZSByK9zcL0Oc7Z vOvNNnz9C1qJouFui73g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olsNV-0089OV-JI; Fri, 21 Oct 2022 13:48:01 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olsNS-0089LS-Mw for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2022 13:48:00 +0000 Received: by mail-wr1-x432.google.com with SMTP id n12so4862905wrp.10 for ; Fri, 21 Oct 2022 06:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1o2x75QMXnEx7W9bo3sYlpr0oxVXvlHN3ieGl1S2FPc=; b=xP8GE4H6xE6AxRKrRfBjGSUdApQQ4zqoC+IvDxaCZImNCndYBMzdKW2mCS3fEYt7sS nAuUBb0pUPYA/w2LT7KagxLEL6jQqECVbML87pOSLccoW0roTJrR7SAgjRICvRiLGYCp le9NUtcLod0mMdpdhh+ZEH0D8UT/AKrjzAIO9jxu8XHYtFZO9GoJO2iHSNQLr/BJ06dy kRhvXeAlmsQx/aPGGpd1yze7sITynMvukqIL4gPJscLE11Jw3Gaa9huXPQLsw1s+oK+0 iVss7axOue9en+cjg9yl8qTB4N+aQDLy+0qIixIJsAGMwVgQRCw6yV/F1B9ZH8KC0kdJ PDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=1o2x75QMXnEx7W9bo3sYlpr0oxVXvlHN3ieGl1S2FPc=; b=S5nHAVHi7KCafavdEu31sRJnvrs8ST/ZFweEWMN84kdQ/TqyIlDPMA0gJXu6Y6Ckmf L8zwPe8ex41kJDWpTaFyNZkam0rHW6fJ/m/PiI3HTl50FA1k5ebOlBcqE5LH9R4/DIMY lL6KLs21zPLxKgrwPTTvsYA+PbnhPPbTlmibIFg1rWxJNMPtTjOtzruV30uXAbAf5iGV f+06FU/NhLNlTGfW02pTBEZTUGFTrrjVPnUVJLnBSokHyg8PkEaNo4gU5eHCOVkmELFi FyFdeTzlOy8xSm2pgNJLO9AfzYHd0N9HjVvtMro100uj9b73rRMzbaTVCN1KvIFMsrwp 9VcA== X-Gm-Message-State: ACrzQf28w9NTXjfIm3gHmgwnmkw01++D5+bSeFLk95lVFwVzEDGAm1qp CpFoK/6KhFS8u/2/Q6q/p7TgTA== X-Google-Smtp-Source: AMsMyM7HNkQXRfeEoGMJwGjRJqAM+RTycmBtrOWBWZf3t8fuqK7LyIqPRZ2kR9DezKDXqyNmm8b6wQ== X-Received: by 2002:a5d:4692:0:b0:235:b188:3ec with SMTP id u18-20020a5d4692000000b00235b18803ecmr6154849wrq.210.1666360076561; Fri, 21 Oct 2022 06:47:56 -0700 (PDT) Received: from nicolas-Precision-3551.home ([2001:861:5180:dcc0:942c:590c:6c2f:3d8a]) by smtp.gmail.com with ESMTPSA id q10-20020adff94a000000b00225307f43fbsm19297918wrr.44.2022.10.21.06.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 06:47:56 -0700 (PDT) From: Nicolas Frayer To: nm@ti.com, ssantosh@kernel.org Cc: linux-arm-kernel@lists.infradead.org, khilman@baylibre.com, glaroque@baylibre.com, granquet@baylibre.com, nfrayer@baylibre.com Subject: [PATCH v2] soc: ti: Convert allocations to devm Date: Fri, 21 Oct 2022 15:47:49 +0200 Message-Id: <20221021134749.196106-1-nfrayer@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221021_064758_767736_EECE7E0F X-CRM114-Status: GOOD ( 14.83 ) 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 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)