From patchwork Mon Feb 13 15:45:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 56345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2419958wrn; Mon, 13 Feb 2023 07:53:51 -0800 (PST) X-Google-Smtp-Source: AK7set/qUQFcmTdBzzvlBBAao9iIFkZJbisk6166Wc+gWFJTcjsB46GiXIB5NhoFdenL7Qwo07da X-Received: by 2002:a50:d69b:0:b0:4ac:b866:7ebb with SMTP id r27-20020a50d69b000000b004acb8667ebbmr8171685edi.9.1676303630888; Mon, 13 Feb 2023 07:53:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676303630; cv=none; d=google.com; s=arc-20160816; b=QDznKJtVt3ROceHS8PpbfsDxju900H+GibmnGe4monxJEiL7WklIwqafR3I/X5LRRe +nGOHBjXzK0EBfPG1mYHrXU8kLVwrFsUckCBaH/BeMklJl2hSJZ34xQyBncIidQvHehU /fd3/5zms7tGXZoXJ1Ie12r5X8oZd1S4AqZIKgmy9Rv7ju0hWHd1U1h9AbiLBfuLdLY2 91uFmAVurcPrPxdmeZ0mqMsq0K5e385vGL4M0MDOFyql8nQMdUIpZwU6FWO3VTzQV3Ej Q6wCs1pZZb1gOAXGu2ylbwiscEfvIXD0XDS1UgubBYRa2+8M4gwyiGKPWrl/dC7fdvXD wbKg== 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=UD5JD8FOKCaphV/AgDpD79DUz09XDK0GsrflfghtnPs=; b=IaruIR9i3jKfsKjOP3KLtaCPBgSrxWf+cgT2Sco0d/5G4WgMrSnPQJAKBzYg3aheHS brt/Y/jrzTIPvkke1kY+qfJGhVZfxhVA62zmWKeSWJ1IAZWWSv8D2jufNSP+R1sNY9c4 12uKvu3118lfcIliejYm6wcmbsi+exKSUd5KTJ1F6LWQjdpA28tj34Tn+8guRmOOGOxL spDlsbAyV2yeDiSTY9BnK0A6j201AiXqfFnXfsC0ZTpJvTjK9fuGC6JMPV5rLKYA2SPh IUHIM5rMI0VBjsa8pbxGtfDQafA1pHVwCEd8UTo8qy85ECoDGaX7BOS8Kea3SqVR03uj 8DnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y9tMvkc3; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c12-20020aa7d60c000000b004acc585f25dsi4476519edr.388.2023.02.13.07.53.27; Mon, 13 Feb 2023 07:53:50 -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=@intel.com header.s=Intel header.b=Y9tMvkc3; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230334AbjBMPpH (ORCPT + 99 others); Mon, 13 Feb 2023 10:45:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbjBMPpA (ORCPT ); Mon, 13 Feb 2023 10:45:00 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23332193E5; Mon, 13 Feb 2023 07:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676303100; x=1707839100; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ll159MuJ96PpKE3mCeyHLSWBuVer23prtFbhwbeYB74=; b=Y9tMvkc3pXsONTpcyl6yEE/DM0tzD1dwOU+CtILPKQ0v8fNr5nECiViK MT662o7/oShMuOsiQvGI0TkfjOqNd/ch/zb06OeBkk8Yp4CRlbf5gxMrY /1sL8rUcRz/dSFhwTuOqrX1UnVukpjtqoouuPMfQDip5XCgrlXB05mZId TgS1cAD8s6wFSvmjYCQwdHhAE2pr/iyLKALGHHC0UPXuTLHSzb/2soMw/ SXk4pWnhJHaC5iNuo5D2+iDdmIThklYRAF6NJ/8y4r/eG6LIUqW7B0yGw 7Xxd/Kb5W3/4PRPhNnodnPL0+dXfBPxMa99w25gYZrRGPFVcHVJV2tUr9 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="318938342" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="318938342" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 07:44:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="618682263" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="618682263" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 13 Feb 2023 07:44:55 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 21B551F8; Mon, 13 Feb 2023 17:45:35 +0200 (EET) From: Andy Shevchenko To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ludovic Desroches , Linus Walleij , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Andy Shevchenko Subject: [PATCH v2 2/5] pinctrl: at91: Don't mix non-devm calls with devm ones Date: Mon, 13 Feb 2023 17:45:29 +0200 Message-Id: <20230213154532.32992-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213154532.32992-1-andriy.shevchenko@linux.intel.com> References: <20230213154532.32992-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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?1757731756030909390?= X-GMAIL-MSGID: =?utf-8?q?1757731756030909390?= Replace devm_clk_get() by devm_clk_get_enabled() and drop unneeded code pieces. This will make sure we keep the ordering of the resource allocation correct. Signed-off-by: Andy Shevchenko Reviewed-by: Claudiu Beznea Tested-by: Claudiu Beznea --- drivers/pinctrl/pinctrl-at91.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 5c01765c7a2a..6d9015ed8a3b 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -1849,19 +1849,13 @@ static int at91_gpio_probe(struct platform_device *pdev) at91_chip->pioc_virq = irq; at91_chip->pioc_idx = alias_idx; - at91_chip->clock = devm_clk_get(&pdev->dev, NULL); + at91_chip->clock = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(at91_chip->clock)) { dev_err(&pdev->dev, "failed to get clock, ignoring.\n"); ret = PTR_ERR(at91_chip->clock); goto err; } - ret = clk_prepare_enable(at91_chip->clock); - if (ret) { - dev_err(&pdev->dev, "failed to prepare and enable clock, ignoring.\n"); - goto clk_enable_err; - } - at91_chip->chip = at91_gpio_template; at91_chip->id = alias_idx; @@ -1882,7 +1876,7 @@ static int at91_gpio_probe(struct platform_device *pdev) names = devm_kasprintf_strarray(dev, "pio", chip->ngpio); if (!names) { ret = -ENOMEM; - goto clk_enable_err; + goto err; } for (i = 0; i < chip->ngpio; i++) @@ -1915,8 +1909,6 @@ static int at91_gpio_probe(struct platform_device *pdev) return 0; gpiochip_add_err: -clk_enable_err: - clk_disable_unprepare(at91_chip->clock); err: dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx);