From patchwork Fri Mar 18 10:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12785177 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 62632C433F5 for ; Fri, 18 Mar 2022 11:00:55 +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:References:In-Reply-To: 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: List-Owner; bh=fNHizvWjuU1rVqsLwkxVoPFjXTewfalq8S1WXMbP1+w=; b=1cx3hLokSIagR8 dPndRBztQbh7DRMFEVkI8eHUVv8iVzhcwumNRaIorUqpiYOZCHNvM6r/TnfY+v65n8sIFm1s7QVEd DTvMgdzJml1hROa7C0Uf6lEHGa2SxqoNXJMG2irRiC0ZDBf/vNP1VT/h7hKUQqBGHC8KnTt0xgfcX kUGPK4Ns6t6tpfuHgY7v9R0dQPHB7BxfLhie0nGmhtuSJvhUgkylrM+N9xAGYcHgD337L+lLG662U lwNfwREG8Fp3ANICXbgIHCHFjVoxMnByxTuiE45aPXjs0dr5XhX7I24OAuxMjz6lASQ5iYRr1GFbs lnKV4wwaEXa/Kpj9GpmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nVAKa-001K3n-QZ; Fri, 18 Mar 2022 10:59:40 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nVAKX-001K32-OA for linux-arm-kernel@lists.infradead.org; Fri, 18 Mar 2022 10:59:38 +0000 Received: by mail-pl1-x634.google.com with SMTP id w4so6669742ply.13 for ; Fri, 18 Mar 2022 03:59:37 -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:in-reply-to:references; bh=JMgc3wka+o++Hf45XXTdLFL85p2TEAv1xtfwOX1r76c=; b=AuNJiLAsKwFcK6iA+Zi89DPL7jrMeQNTswTDATRhGHGQ6i7F9xQiXUlp7F+CYjEFQX zTH3aYxX7+Q40QPfHH0UxJjXD+YIh9mvxnlhPtYWKF//98nmVmKNVSnY51Jf4Dq47c/E LDsdOpdkPsP9bC85I0Ppris6hlxo44ZsvKVk81trvQwK1FsXptjqOud45EHUkFZvK8Gq GQKXJ151mXTravr/px/gbbsrpd4qZh+9hkZBRbCLlh/sHzY5RcqgY7VTqA6F8kRvX0TK cSSlemwmfwiIlssb/lTzfIo2dWSUtoGRCih/hiQqoC+blPetmdWpIuYQ3KHZe6g/xZzI n9Jw== 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:in-reply-to :references; bh=JMgc3wka+o++Hf45XXTdLFL85p2TEAv1xtfwOX1r76c=; b=N107vLJas1i+eGTOcyJEVejQ/szAsCPREaZzc6d73Zjs4JaT/YOwa14XwPwnXO65F1 1BqpcDN9nTPRqDQKVrM/PQxHvSbiAPLFVGotpAcSGPccLCMKHgh7fw2Nz0+rpNPbD835 WaSOMUk1zoWAzu+2doLtIGQTUBdb1N1ZGlYRJFFd4EOlFvye6TuR+0TuaWO0u6+7jDXt sEuN4wHQVqX19zlUCMquDJDX4foEoRe0zMF0fFRfIuCK9DEFI9cfFs6cyLLM1rMnovKZ kqElGrUBE/MSwzhAtGzO8W3G44POstHjzE6XNdrj/N2XNltQBzEHq13nyAIN6Y2WJ5hP KtOw== X-Gm-Message-State: AOAM533YPgRQb+iSxFcZaIlyuRA2M0uKl2/38Fczit6k4hSz1PCUHGtP KWgPJZUPWAr+HY+H2ieUjVU= X-Google-Smtp-Source: ABdhPJwbsNlyjNQOdLY45VJtqKPS4IVi89HNLEj8CmVBUk5EsrBeA3YP8NMjNusRYeviVq2HoajRcg== X-Received: by 2002:a17:90b:4c44:b0:1bf:f00:3735 with SMTP id np4-20020a17090b4c4400b001bf0f003735mr21180733pjb.168.1647601177091; Fri, 18 Mar 2022 03:59:37 -0700 (PDT) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id z12-20020aa7888c000000b004f3fc6d95casm9420298pfe.20.2022.03.18.03.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 03:59:36 -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 v2] ARM: pxa: Change clk_disable to clk_disable_unprepare Date: Fri, 18 Mar 2022 10:59:31 +0000 Message-Id: <20220318105931.18480-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220316022122.7426-1-linmq006@gmail.com> References: <20220316022122.7426-1-linmq006@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220318_035937_814409_4B3725DA X-CRM114-Status: GOOD ( 15.74 ) 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. 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 --- changes in v2: - fix typo in commit message. --- 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); } }