From nobody Thu Sep 18 05:40:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34DAEC4332F for ; Fri, 9 Dec 2022 15:30:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230477AbiLIPan (ORCPT ); Fri, 9 Dec 2022 10:30:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbiLIPa3 (ORCPT ); Fri, 9 Dec 2022 10:30:29 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E6141DF0C for ; Fri, 9 Dec 2022 07:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670599768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lr1I/+6NJl6q9eP4NAD2iuzXJUU4OlB0nQOPAqBaOdE=; b=LgcKxnb4gv5dOQSNhENKN70U/S4NbpTQMJfkXPxSnEh7ZL4uE7fGPZBNskcMv84txyIffU SrS/RGFWmK7FPwv/PNuD/RChW7LV1ocX0MGu80VrDJTU7jORcBukNj/hPixgMAaoet59WX t34Vq4ew0SpyQaR3uRxaoYdrHJgBCAc= Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-1-SLF0HJu_Mneq5wBRveorrA-1; Fri, 09 Dec 2022 10:29:27 -0500 X-MC-Unique: SLF0HJu_Mneq5wBRveorrA-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-37360a6236fso53867927b3.12 for ; Fri, 09 Dec 2022 07:29:27 -0800 (PST) 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=lr1I/+6NJl6q9eP4NAD2iuzXJUU4OlB0nQOPAqBaOdE=; b=DWmJIsLESSZUjTF9qFSycZY4gpcoCVvVkaVdaihQmuVDNLn/3GDU+EDT9arDs5ZK7F 6TCKLB/HN6DFlJdHrxoQxw5ZQ4q9lnW88pm0Xy0qqBOSafRNT//e59KAs+vBv4EGK0gz jV9Qs6EiBQfMxFYywQsGWfSrTr0p1nEukkaje4/E+7osMf9s6foHdm5Ve433zTSVBLKm Dy+tmaqlWjL9fB6zqMpcCxsv6VfcznS6DGiXHxtINs5YXZwR/VsOmcb76UUWmXRokwGs 2pJ1iJTfFtCGjTW6vVKS4QWFKSSbFPeVQQ7ZpBYzB4/LxZaxEm+udhzVSNP8kkRv7zxH JYCg== X-Gm-Message-State: ANoB5pmDA1fFj2yG1P6MsDjJLhRA9kNNgaMFZuPzfhxPz1SfagvYkj4j NyK6XvZrS0PePljLcOZUhZJmRNQ/MT2uWT/JmAFnmzkIQuljvS6eZNBiVHc7/gEKPg3LTyi9MTK wLDTVDyy69yVGqsvyGCPf2Ww= X-Received: by 2002:a25:3c1:0:b0:711:a37b:d738 with SMTP id 184-20020a2503c1000000b00711a37bd738mr4987646ybd.1.1670599766788; Fri, 09 Dec 2022 07:29:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZJUWfeSaSFSwEQOFa+G+37DwRvr94jg0o73/+tgv7A/3Ara71ex+J6cW4fNuj7wJ9mdAwfQ== X-Received: by 2002:a25:3c1:0:b0:711:a37b:d738 with SMTP id 184-20020a2503c1000000b00711a37bd738mr4987629ybd.1.1670599766591; Fri, 09 Dec 2022 07:29:26 -0800 (PST) Received: from klayman.redhat.com (net-2-34-28-158.cust.vodafonedsl.it. [2.34.28.158]) by smtp.gmail.com with ESMTPSA id dt26-20020a05620a479a00b006fbf88667bcsm29484qkb.77.2022.12.09.07.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 07:29:26 -0800 (PST) From: Marco Pagani To: Dinh Nguyen , Michael Turquette , Stephen Boyd Cc: Marco Pagani , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] clk: socfpga: arria10: use of_clk_add_hw_provider and improve error handling Date: Fri, 9 Dec 2022 16:29:11 +0100 Message-Id: <20221209152913.1335068-5-marpagan@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209152913.1335068-1-marpagan@redhat.com> References: <20221209152913.1335068-1-marpagan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function of_clk_add_provider() has been deprecated, so use its suggested replacement of_clk_add_hw_provider() instead. Since of_clk_add_hw_provider() can fail, like of_clk_add_provider(), check its return value and do the error handling. The indentation of the init function parameters has been aligned to match open parenthesis as suggested by checkpatch. Signed-off-by: Marco Pagani --- drivers/clk/socfpga/clk-gate-a10.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-g= ate-a10.c index 7cdf2f07c79b..06f129c160bc 100644 --- a/drivers/clk/socfpga/clk-gate-a10.c +++ b/drivers/clk/socfpga/clk-gate-a10.c @@ -40,7 +40,7 @@ static struct clk_ops gateclk_ops =3D { }; =20 static void __init __socfpga_gate_init(struct device_node *node, - const struct clk_ops *ops) + const struct clk_ops *ops) { u32 clk_gate[2]; u32 div_reg[3]; @@ -94,13 +94,25 @@ static void __init __socfpga_gate_init(struct device_no= de *node, socfpga_clk->hw.hw.init =3D &init; hw_clk =3D &socfpga_clk->hw.hw; =20 - if (clk_hw_register(NULL, hw_clk)) { - kfree(socfpga_clk); - return; + rc =3D clk_hw_register(NULL, hw_clk); + if (rc) { + pr_err("Could not register clock:%s\n", clk_name); + goto err_clk_hw_register; } - rc =3D of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); - if (WARN_ON(rc)) - return; + + rc =3D of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw_clk); + if (rc) { + pr_err("Could not register clock provider for node:%s\n", + clk_name); + goto err_of_clk_add_hw_provider; + } + + return; + +err_of_clk_add_hw_provider: + clk_hw_unregister(hw_clk); +err_clk_hw_register: + kfree(socfpga_clk); } =20 void __init socfpga_a10_gate_init(struct device_node *node) --=20 2.38.1