From patchwork Tue Feb 21 11:55:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 59906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1820561wrn; Tue, 21 Feb 2023 03:59:33 -0800 (PST) X-Google-Smtp-Source: AK7set8z7+g9ygXo+7Z+wohV2szpFupWYRGe+jwMaiQrM4U2UiqeYvuGkVmqXEIvZswJQ7hnczBr X-Received: by 2002:a05:6402:7cc:b0:4ab:4cf0:4ab3 with SMTP id u12-20020a05640207cc00b004ab4cf04ab3mr2799740edy.38.1676980772994; Tue, 21 Feb 2023 03:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676980772; cv=none; d=google.com; s=arc-20160816; b=crgemaYpUE6GpKpu9XF4fgQKswEtLHdGi1q1PjnR7kBU/fMJr1O98EQ6P9INsfNQwV iAMQ873mbuDVeMtUUTUAGzI57pbiBS1OVHtOnXKck6QXXCmRm45TibUb3j5YP/E5O6Py Kh8RNAaWREfI6qAIEM1vH88GwWZjjbNDnj4/ecjL9zJY4R6hMYqbSib72+cnE6oI1E35 hVeyMMs/Puw9hbRbqH4u4AS5iLeQ7j8sEc8L5QZWv5TN06T0QMjIQ7j1rlvBidCYYhGR ScTXSQ8eDWLUWje7A8siNW6c+3J2iuJ05xofO7YQymoEebwHTRucw5LscEooLyAqYSkm XSxg== 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=RWgD06ZRhBWQZ50UZ5zihGOiBzCOy4ayqTL+yOR7hH4=; b=eyorlqOFIsVTosbBi9TJK5BcGq5mYtoYeBTdqR/cnkwETRLdSOUpB3xuMCntTy7ntO T1lZ0qW8znjfzCUEpSmkevaTx86uD9VOOHpjv3U7i3qvO7tKyuCs40DGAzaRSyqoTCxR QkIFUQ+QZgzQV5enPtXjKMmSSjaxhSrlrtOgqUu9Uu/Nb9aCH3wibomdvHO3oyg6E6xJ RoMLLexkhvoAjPD5m8JxUmCzNu45ymDETMlIAmx/9gnhzKx8O8Q4LIqNqmK8f5R5pe8A 7K92imKFtFVM9Bdgg1otS4F5LqoJo4DAZTtfnskHbahQ8ULV09XruL2JKmlvBFILKweU T/Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gOOg+8ew; 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=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b19-20020aa7d493000000b004ab250bcee6si5365814edr.648.2023.02.21.03.59.09; Tue, 21 Feb 2023 03:59:32 -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=@collabora.com header.s=mail header.b=gOOg+8ew; 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=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234474AbjBUL4v (ORCPT + 99 others); Tue, 21 Feb 2023 06:56:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234470AbjBUL4o (ORCPT ); Tue, 21 Feb 2023 06:56:44 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E2EF28221; Tue, 21 Feb 2023 03:56:20 -0800 (PST) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id CE4AA66021CA; Tue, 21 Feb 2023 11:56:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1676980565; bh=hBKMIaocGmn56Ueun8XDpc5jewvKlJ1Bcnnlk9bLbIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gOOg+8ewt+jQAM1BUEPjy31CsGclucBT7KyU3A5zaX6j6pJB5jrCiKtvYQQj6Qci4 WG8gFboBVO8UPANqEi14icikqPJLMC8v3TcoI5kplCFKHySKhsQa+1LDZ1LIkAlPlR WTIfV3vgWw639zWCZmJqRyBXHXTTWKhNKWPtMngu3jJ5MDNFLBZqmF1i4LA82vHASZ eBWKnfSZrjhba5FL7EC4QauqzLRVD2UghkWQpqUOmiTbcQBLbW/PnhrFWxMMXy1EW6 YuSs6VYnRIBrEEuh5t4G8y6USZHx7Skae5HtFZInwfV0K9aqSIVYJq59D86oCI5WOe M2+fgrqHOR3Pw== From: AngeloGioacchino Del Regno To: mturquette@baylibre.com Cc: sboyd@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, wenst@chromium.org, johnson.wang@mediatek.com, miles.chen@mediatek.com, chun-jie.chen@mediatek.com, daniel@makrotopia.org, fparent@baylibre.com, msp@baylibre.com, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhaojh329@gmail.com, sam.shih@mediatek.com, edward-jw.yang@mediatek.com, yangyingliang@huawei.com, granquet@baylibre.com, pablo.sun@mediatek.com, sean.wang@mediatek.com, chen.zhong@mediatek.com, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v4 07/54] clk: mediatek: mt2712: Add error handling to clk_mt2712_apmixed_probe() Date: Tue, 21 Feb 2023 12:55:02 +0100 Message-Id: <20230221115549.360132-8-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221115549.360132-1-angelogioacchino.delregno@collabora.com> References: <20230221115549.360132-1-angelogioacchino.delregno@collabora.com> 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,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?1758441791211669565?= X-GMAIL-MSGID: =?utf-8?q?1758441791211669565?= This function was completely missing error handling: add it. Fixes: e2f744a82d72 ("clk: mediatek: Add MT2712 clock support") Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Chen-Yu Tsai --- drivers/clk/mediatek/clk-mt2712.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c index ce28ee47f5cf..8aa361f0fa13 100644 --- a/drivers/clk/mediatek/clk-mt2712.c +++ b/drivers/clk/mediatek/clk-mt2712.c @@ -1091,15 +1091,25 @@ static int clk_mt2712_apmixed_probe(struct platform_device *pdev) struct device_node *node = pdev->dev.of_node; clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK); + if (!clk_data) + return -ENOMEM; - mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data); + r = mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data); + if (r) + goto free_clk_data; r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); + if (r) { + dev_err(&pdev->dev, "Cannot register clock provider: %d\n", r); + goto unregister_plls; + } - if (r != 0) - pr_err("%s(): could not register clock provider: %d\n", - __func__, r); + return 0; +unregister_plls: + mtk_clk_unregister_plls(plls, ARRAY_SIZE(plls), clk_data); +free_clk_data: + mtk_free_clk_data(clk_data); return r; }