From patchwork Wed Mar 16 02:21:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12782061 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 1DE8EC433EF for ; Wed, 16 Mar 2022 02:23:11 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To:References: List-Owner; bh=raXzSbsQKgdfsgLiZWdfkPL3KnFWwdq9H3u8kv9rtIY=; b=vkcdsCT6LDeNLD m0uufE4wNSr1f3jk9IVVn9H+UbIEMPjnWGN+LTJ/jB/wZOtwvz2VOchwQogW2YSsVxwKQljIgzov/ qQ7S3vO3LGkOOhIHvW8VqUVHj+t/pV2H6lYbfEvRwY2D11QbfEAZAH9HT/20OvwPow/+56wo4IxAq ud0uWXEzCdIaY3FzDxtCUCsJQ3Tn1b1LjtnvN7lV8TUFDmHoslLzPwpPq1k6C06+Zyc0+UaT7b1LV eQwxNf/rkYxSXuh5TLpZCkIagvOnEdo9HjHhlxxwqCNKVYYXevFZyYxAdqNn3Yct+bLiPnKmiszVp m0SK+3DNsXQLXHPaP4PQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUJIF-00BBns-NA; Wed, 16 Mar 2022 02:21:43 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUJIC-00BBnA-Om for linux-arm-kernel@lists.infradead.org; Wed, 16 Mar 2022 02:21:42 +0000 Received: by mail-pf1-x432.google.com with SMTP id d19so1884503pfv.7 for ; Tue, 15 Mar 2022 19:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=mpIGdb55Nd4sn/CpKfkQzU0+Ne3ozaz+3vbBHRA2I6U=; b=STJJhjhySdxRolMQ6fId8pdd/hZAOz3EpMWlonsXd8vSgXzLo6gP73O9ekBBfrS9wI 3nsfbhCR+Q6YqWsymo5rs4GMKS51FLBlOZyYmGsucAWFRX3KFmT13t/rbwHSi+jaud3G Dyh/+cXbCgtjWD1Ev5Xfg2olYx8TPAISk4lYVUuuJKiCDADcZoH9IaNu1gAjkdJSMGdP P3NO2s8eFzTsWHg6sqKQJpC1GpDBYsclPozt9ZmRfQkQbv9Fn43YOgMZfCLaPsudrEuq s9BDfBxnJ5sniUbt/+u49qELuen3qi2Ood2hji/DlR1rPP01jFM5F8dY7/52j0gqcTYZ +TIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mpIGdb55Nd4sn/CpKfkQzU0+Ne3ozaz+3vbBHRA2I6U=; b=XRkKp7VmtiudATSMNIQLBqKHfFfmT2JGqdJMxfiSpoDF4GdCxxP+kX5fWRORkljmUT eBxFOJ6RNtmpsYMS6OQK0U0RbwY9nKucAWS9BxLtw+yDft+COwMqvyLwUoq7ZzffVJfM G1ZV3i5gadsx3cibO/yaWKkHPFPE+wv1CtaSdgWN8I6xvOkVTpk8JHI2k93rzg/+50AH kM0w5+oWDBux9U7gx5ScHV0SkgDrl7CmoJNkRMorrvzwEraEOfdXk1s1+imJhIQng89H OdLqxp6eAVJHjRjmQR+fwLBCfRbv88EyVZMFrFaGSbPZ2MhiSkq9/Dy80blaiAfwWyNL FojA== X-Gm-Message-State: AOAM533zp2JjZvtqFV9uSUCgv7NfFIpB/wXArbQNffiyldbjL/Ru6oiP veKe9ICJmVjiT1dAONFONKY= X-Google-Smtp-Source: ABdhPJw2oM4iw4X9LdjPldazp7yPJi6PzmHFFz+lxJaiE9molHGTsa7R9nL6wpCNalHa8LzYxaDVBA== X-Received: by 2002:a63:4e52:0:b0:380:7c35:fc9a with SMTP id o18-20020a634e52000000b003807c35fc9amr26129775pgl.376.1647397299989; Tue, 15 Mar 2022 19:21:39 -0700 (PDT) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id q10-20020a056a00084a00b004f7ebae5be6sm469764pfk.155.2022.03.15.19.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 19:21:39 -0700 (PDT) From: Miaoqian Lin To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Igor Grinberg , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] ARM: pxa: Change clk_disable to clk_disable_unprepare Date: Wed, 16 Mar 2022 02:21:22 +0000 Message-Id: <20220316022122.7426-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220315_192140_850308_14438507 X-CRM114-Status: GOOD ( 13.99 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The corresponding API for clk_prepare_enable is clk_disable_unprepare, other than clk_disable_unprepare. Fix this by changing clk_disable to clk_disable_unprepare. Fixes: 7a5d9a913f91 ("ARM: pxa: ulpi: fix ulpi timeout and slowpath warn") Signed-off-by: Miaoqian Lin --- arch/arm/mach-pxa/cm-x300.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 2e35354b61f5..fcf5b8fa5b9f 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -538,7 +538,7 @@ static int cm_x300_u2d_init(struct device *dev) err = cm_x300_ulpi_phy_reset(); if (err) { - clk_disable(pout_clk); + clk_disable_unprepare(pout_clk); clk_put(pout_clk); } }