From mboxrd@z Thu Jan 1 00:00:00 1970 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 DB243C433F5 for ; Fri, 30 Sep 2022 17:29:58 +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:References:In-Reply-To: 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: List-Owner; bh=Y3sKAdONOzdPqyPhHHaphOp7WRXEtZtfPPnE268jcCw=; b=sRrMxfLNgl/76M u2r69dFr2HQzFFc518ursrghwEsRhubaLG1uvSkb15kRvPKY4Jbb9vxfavOKtW3X5CIXDyPFD+5gY VrgY83VvfEPzvr5ImQTGUyIM+wudjVPTOnOILn2n67ZHPHnT67ufJsFt0VM8jukmNqIdLuwNTqvud aQzHGjEzriqwdJKjU1D3pd44IUnVsJPmAI0DxwdU453eJDU3SctY7GQcFx/W2xULkNwLtff0rGWG7 RfIZVjaCN343THaSkA8kT+iapiktZ4xckwB24J0RbLlCDVDHhXLtHsUPlF11EnvM8cJfZuxCXamtf hxEUwtzr9FkE5JCFW3JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeJoh-00AnN8-UJ; Fri, 30 Sep 2022 17:28:52 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeJoV-00AnJb-Oc for linux-arm-kernel@lists.infradead.org; Fri, 30 Sep 2022 17:28:42 +0000 Received: by mail-wr1-x436.google.com with SMTP id f11so5206259wrm.6 for ; Fri, 30 Sep 2022 10:28:38 -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:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Vm4TpO3JY+1vWDls351l9UZb/Y7basVTL7Grm/yg+jM=; b=AG1ywY7gc8eweWCRMYD9l1xeuVWvjrZWx7+dHX3zI3CH7biq0V/89BLSi7C3ohPn42 SMqTVcktNRBVpC6qkQVA+/cGJD1x/Ptk7VD4q4RyWdqGT7idOX+3TWdXzakQs2hu1rPo lcLrGbleSxVQp4Q8cAnbEC2/AbbAYmAkesLMbn10rEg+JD/OqWQUaGkiEnMsoZ0dl/mJ 0W+O18C4E5oLv52iokVkjg6r+9ocy0SOTZ8xZvs8tCXn5PsMZFojlzChs9o7vdvd104/ KNensBBdH9lMjBgO2Lv7sInwJlZ8Rb9EppzWUtx/CnVaG0j0Z6kdMkxYOsZsBsSkXH8x 4Q0A== 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; bh=Vm4TpO3JY+1vWDls351l9UZb/Y7basVTL7Grm/yg+jM=; b=pYEyGpapcQHKH42FILr2ljezM1b1mY3f8iah56x5HxKpODv7HZ4ihpIyF2doCJdtCm aiHB1LM+LxMwuJ0VERr/hz72Peb2W49gtYYIR+tIfFNrkJDjh1FEjK4QO0/Vme6ikBkR nDKuIIA6P9wBlAnFF4WACvA+8W2ajSGhEceN3me5QHsq7QzzTbql9LLQZPMzRI8Devh8 GtNNLHx9Sy8UWTt756rp/VmN2wLyex56ubM04zi9SN/1Mxo9tGd0LAGpZKCgKurgqHP7 bUXdphDNwoo5oXlDGVRoNokS8AwUvEISu2x7pZZuCL2lInKusQ0JPVLL+D3GBN+WP3S1 KeTw== X-Gm-Message-State: ACrzQf1Hlp0Eg54nR+lKte/+QBjW+erhMXLP1bvJLsHY389Lrp2x0FWP t0kKSYatp3n/kgAmgtd4Ua9hlQ== X-Google-Smtp-Source: AMsMyM446LRNJW8x7k8pG0/1PnITT3jj7wcPLz8OsFiS1LUmRhSfNehfesLHnoNyFBZ0Yo+ifaGZjw== X-Received: by 2002:adf:b34a:0:b0:22c:bd74:1f06 with SMTP id k10-20020adfb34a000000b0022cbd741f06mr6794434wrd.77.1664558917678; Fri, 30 Sep 2022 10:28:37 -0700 (PDT) Received: from nicolas-Precision-3551.home ([2001:861:5180:dcc0:1a56:87a1:b5b8:453b]) by smtp.gmail.com with ESMTPSA id bv14-20020a0560001f0e00b0022ae8b862a7sm2525407wrb.35.2022.09.30.10.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 10:28:37 -0700 (PDT) From: Nicolas Frayer To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, khilman@baylibre.com, glaroque@baylibre.com, granquet@baylibre.com, Nicolas Frayer Subject: [PATCH 1/2] soc: ti: Convert allocations to devm Date: Fri, 30 Sep 2022 19:28:09 +0200 Message-Id: <20220930172810.199758-2-nfrayer@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220930172810.199758-1-nfrayer@baylibre.com> References: <20220930172810.199758-1-nfrayer@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220930_102840_008447_79C13550 X-CRM114-Status: GOOD ( 15.87 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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..a29f5a23395f 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 != NULL) + 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) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel