From patchwork Mon Mar 6 18:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 65039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2008500wrd; Mon, 6 Mar 2023 10:40:08 -0800 (PST) X-Google-Smtp-Source: AK7set+lUslmjVPbqyVozgEpifBC+KmDUDBorVpe2uvRqmK5HGXo9dNG5n06OeSG3IRg+w3zikco X-Received: by 2002:a17:906:3197:b0:8b1:3293:ead2 with SMTP id 23-20020a170906319700b008b13293ead2mr12304495ejy.25.1678128008339; Mon, 06 Mar 2023 10:40:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678128008; cv=none; d=google.com; s=arc-20160816; b=xfrNXf5uGx1XYYETa+BvOENfmqoPhRLstl1Tf11JZh0F9FVFKZatTU+zJZpZHIS9qw kgY9ErvYg1ILqmUhfXds7GeVV6vvQWiWrEdmffxxrGhHp3SKo6mCoLOqT+whFE0MZ+ju sP8oay52nNjKx2QAWMcUuORf2avsXRX1tlgD8IBJvtuCBjCNjupMN4YI7NxTPpPTksr+ Uv/KUdpWNoLUbxM5qGMvfWG+SdFaeaGa6SCd7+X4FXdenHE7TDMo/jRGqozIJUtmCabv iUsuBo0tLOL2PfaUm1zZcOFG7t6T9HsBBC+wa6Wu2+3OAYGDj01IjsXktNvy3V3FFOyA ukAQ== 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=Kj7URn4Rus4QtjjjG4qiQ4WeHaBDwwdkODo1IdYOWTI=; b=ek1DuNLkkieH0/E3PWFZEtvGUMZbwzJlGc6n2F0unqJncmTmmToJrKunrlHHIIgaO0 MRhBBLyKT77EE+lNeY1ZJ479s2aIDGfVIiVRuB+oa7QEkmw6dQV7VtEFk5jrJGykuD/D 2iWA+lvPKQE+7bO4kY3KgEEBawC5IgK4ixfhj5osXYHrBbvuWDBWci18mgFyvB9c/AuV /OopymmZoXgpZ5UStu1o4UYDvmRqSdkpYVhLT5XAWX+0/R5S8cdFuOLIT8ZIe761aQlC zuLg8KdNijUKqA7uYIg7H1yWBMSTEzHFbT0kw6YfF9FDkGoTDHTcuRxLxLHYSmcdwu4a 0a8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aSvqLyRk; 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 m22-20020a056402051600b004aaa70a9f13si11684314edv.298.2023.03.06.10.39.44; Mon, 06 Mar 2023 10:40:08 -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=aSvqLyRk; 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 S230212AbjCFSat (ORCPT + 99 others); Mon, 6 Mar 2023 13:30:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbjCFSak (ORCPT ); Mon, 6 Mar 2023 13:30:40 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C38A8301B1; Mon, 6 Mar 2023 10:30:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678127439; x=1709663439; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JPcoNFmGiGsUtQhMFEvvIYMF9pcbCxGWNO7kulXjTb8=; b=aSvqLyRk71r2sJ6t7kut+GYRtZY5OUqQCLQFdVYw+++yfbVTfC/lIe1p tlW1ekO7kVwdFnistDQZJ7/j6HBUsD5YxcFxZsO4xkwmerp4aj1+m8iJu NBJxCodcsvW73TIyuyMqFNWf3lbqLmnyuZgs09aK9D+v032vR3C8Bjh2y l0swk32RSABE4BfDAvUlH+eKEKpk1nZeN7QnmoW81oCbXbfL5On0QHn8i nHTwwAHOYiWis5A0PbwTxUF1tJxtcANHr/c/Y8AVERWJOswsB0PB2hlNX AHHJ1MT2raJePuK3AZV/bqX5SJy87LtNctF63zH6r6e5r9S05Dzbw741c Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="333109225" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="333109225" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 10:30:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="669559043" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="669559043" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 06 Mar 2023 10:30:36 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 76B25354; Mon, 6 Mar 2023 20:31:19 +0200 (EET) From: Andy Shevchenko To: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mark Brown , Rob Herring , Andy Shevchenko Subject: [PATCH v1 3/5] spi: mpc5xxx-psc: use devm_clk_get_enabled() for core clock Date: Mon, 6 Mar 2023 20:31:13 +0200 Message-Id: <20230306183115.87314-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230306183115.87314-1-andriy.shevchenko@linux.intel.com> References: <20230306183115.87314-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,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?1759644754703114686?= X-GMAIL-MSGID: =?utf-8?q?1759644754703114686?= Use devm_clk_get_enabled() to simplify the code. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-mpc512x-psc.c | 39 ++++------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c index 8a436d1906eb..739df2b241e9 100644 --- a/drivers/spi/spi-mpc512x-psc.c +++ b/drivers/spi/spi-mpc512x-psc.c @@ -54,8 +54,6 @@ struct mpc512x_psc_spi { struct mpc512x_psc_fifo __iomem *fifo; unsigned int irq; u8 bits_per_word; - struct clk *clk_mclk; - struct clk *clk_ipg; u32 mclk_rate; struct completion txisrdone; @@ -499,25 +497,15 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev) return ret; init_completion(&mps->txisrdone); - clk = devm_clk_get(dev, "mclk"); + clk = devm_clk_get_enabled(dev, "mclk"); if (IS_ERR(clk)) return PTR_ERR(clk); - ret = clk_prepare_enable(clk); - if (ret) - return ret; - mps->clk_mclk = clk; mps->mclk_rate = clk_get_rate(clk); - clk = devm_clk_get(dev, "ipg"); - if (IS_ERR(clk)) { - ret = PTR_ERR(clk); - goto free_mclk_clock; - } - ret = clk_prepare_enable(clk); - if (ret) - goto free_mclk_clock; - mps->clk_ipg = clk; + clk = devm_clk_get_enabled(dev, "ipg"); + if (IS_ERR(clk)) + return PTR_ERR(clk); ret = mpc512x_psc_spi_port_config(master, mps); if (ret < 0) @@ -528,24 +516,6 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev) goto free_ipg_clock; return ret; - -free_ipg_clock: - clk_disable_unprepare(mps->clk_ipg); -free_mclk_clock: - clk_disable_unprepare(mps->clk_mclk); - - return ret; -} - -static int mpc512x_psc_spi_of_remove(struct platform_device *pdev) -{ - struct spi_master *master = dev_get_drvdata(&pdev->dev); - struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); - - clk_disable_unprepare(mps->clk_mclk); - clk_disable_unprepare(mps->clk_ipg); - - return 0; } static const struct of_device_id mpc512x_psc_spi_of_match[] = { @@ -558,7 +528,6 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match); static struct platform_driver mpc512x_psc_spi_of_driver = { .probe = mpc512x_psc_spi_of_probe, - .remove = mpc512x_psc_spi_of_remove, .driver = { .name = "mpc512x-psc-spi", .of_match_table = mpc512x_psc_spi_of_match,