Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2334976pxp; Fri, 18 Mar 2022 08:25:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe1N3Bs/yOGp+fVNGCK5vqf+8b+wA+TsBpsUSQhzos0RgDvuQ3sntiHTRRTikvstfJtNuc X-Received: by 2002:a17:906:d54d:b0:6db:ab37:60d0 with SMTP id cr13-20020a170906d54d00b006dbab3760d0mr9275772ejc.234.1647617119276; Fri, 18 Mar 2022 08:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647617119; cv=none; d=google.com; s=arc-20160816; b=GUHJ71F9/g4zqnredDBON6XJk5s9gKfAqElXL+RVYNLjvBUVDF/PHKRKVHuMH79Qhv eNEWl02NFnoEE2gVzGC6tamaurpq+z7sIajAQ7WFYgATN603tK05BYgCH+cOtwgSzfwK xusvY1Fh36TySXVQBw/yhfbqZkv39ScI1e7QjOvReJhGsRyz6tkfVuLJ5VyDZjF5kiB8 ZdWE3JCcSLBA5Njt/rgbeFEFDO86ftXTnIhz2tcjPpulsZQSxhhovQzNkdTkWyry1Dif Gtqh4zSeJ8wzHWbQ9e1mz4QLoAeGzwA2jER1WOH3M9PzZf2rnGt28TDR3AOGLNCe76yZ kHyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=JMgc3wka+o++Hf45XXTdLFL85p2TEAv1xtfwOX1r76c=; b=VQN0OjNZQyD4N/2N5tvWMDsKdlaMNdammDHTpsqz48e2TsbWYMuFu9hKeE4Eob2k4n sViMmcJd4R/LgIEIvmaIwcO2klp2hW3wYQCQFKQLJlZyozpl08r67V1NpQHV+gAda2kh hcq8VU7HiHMFFYqi4baFuFqtvcHqW0q0ThnGM45Aap74lEjkU2eBAbZNypx72XojDWAz zEMppHnEVUe3zbsyxQBw6bGM1y4myicu27NNf168898SkRU+lNvj/twCmGexlSRHKaDJ N4v78436gSrRxj0pueIJ3t7LAm6evzhrx2nexPqBdYdq+WWNM5Mq5pPx4jUPlr5FFai8 y0FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AuNJiLAs; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v12-20020a1709062f0c00b006df76385d26si1292647eji.454.2022.03.18.08.24.36; Fri, 18 Mar 2022 08:25:19 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=AuNJiLAs; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235558AbiCRLA6 (ORCPT + 99 others); Fri, 18 Mar 2022 07:00:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231196AbiCRLA4 (ORCPT ); Fri, 18 Mar 2022 07:00:56 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 808E52D7A8F for ; Fri, 18 Mar 2022 03:59:37 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id n7-20020a17090aab8700b001c6aa871860so1902348pjq.2 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=TlKT9Cs066y51V4MUzge+xQBtsg6klyHn3t/C+JdTOR6zsphNjXvD5GXNkGj2f8Xnc S4/UZO8YEwtHgD0PZEmpoa1KNYRJylUuPFi8QJ7tua7URMA/xp4i9nP/Ge/5tfGTNVDN BGiJjmzB1we/DQEpxA7HEzjMRS2jHUMu4PrgaQ4igoE66EycSCr3pdB4i/UvX9vO1Xnt mu7X6cdpMrYsVN7PLwqPLAEHYUhLlz4O5Br/0+P/Q5Lp0kDkhDiqySAlFgXBB0YV5pkN 9+6wEbDnKUljWC0wStgeei3EeevGnOOlpdRp5RJhXyFQBfo4p3rt9lesHGyZ5VqqJ/W6 DzmQ== X-Gm-Message-State: AOAM530iJ5y0wMzfvi/CYofNCy9TQlzOMyDFaGvXXSiKtWkfpK9URu9R Kwkqbux8VRaMQALgLrnyoF8= 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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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 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); } } -- 2.17.1