From patchwork Tue Mar 10 12:39:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229732 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B653C18E5A for ; Tue, 10 Mar 2020 12:54:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4C8D20674 for ; Tue, 10 Mar 2020 12:54:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844882; bh=gT28lgSALOjg9Oy2Uz9uwJz0kp5lejbDlA6KiD7JrIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HP9EIR6NUxM+g1fK8udDWCs3Y2iuBZYF1sRFQuJkmAvIcDUNAuRiX2E84L6K96l7n emMyZtpDYm6QeBDMIh11nEqKPkWnjbK2LkFd6wvJLwAsBIEinOlmem0wj45w+57FMe rTAagt1vh2iY5vnUu83LCoisUK49b79IE3HgNKkw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728992AbgCJMyl (ORCPT ); Tue, 10 Mar 2020 08:54:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:33160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728574AbgCJMyj (ORCPT ); Tue, 10 Mar 2020 08:54:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE4F420674; Tue, 10 Mar 2020 12:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844879; bh=gT28lgSALOjg9Oy2Uz9uwJz0kp5lejbDlA6KiD7JrIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z2yS+4nKLCwDupp9EXNK3LsqOx3xBgTlahmC1z9kQlByxL3+4nFKmQPOo492s4nRr jLyyCymvzj6ebFyLPounv1X6L+5tNz0YoD1m3DFr7AeXKsdUrFF8972Et3XtGDAglu /66pwRDNSLe4A/3vA2cJodTIKRNeGsXiXeyGsA/I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Jonas Gorski , Mark Brown Subject: [PATCH 5.4 114/168] spi: bcm63xx-hsspi: Really keep pll clk enabled Date: Tue, 10 Mar 2020 13:39:20 +0100 Message-Id: <20200310123646.963911379@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123635.322799692@linuxfoundation.org> References: <20200310123635.322799692@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET commit 51bddd4501bc414b8b1e8f4d096b4a5304068169 upstream. The purpose of commit 0fd85869c2a9 ("spi/bcm63xx-hsspi: keep pll clk enabled") was to keep the pll clk enabled through the lifetime of the device. In order to do that, some 'clk_prepare_enable()'/'clk_disable_unprepare()' calls have been added in the error handling path of the probe function, in the remove function and in the suspend and resume functions. However, a 'clk_disable_unprepare()' call has been unfortunately left in the probe function. So the commit seems to be more or less a no-op. Axe it now, so that the pll clk is left enabled through the lifetime of the device, as described in the commit. Fixes: 0fd85869c2a9 ("spi/bcm63xx-hsspi: keep pll clk enabled") Signed-off-by: Christophe JAILLET Acked-by: Jonas Gorski Link: https://lore.kernel.org/r/20200228213838.7124-1-christophe.jaillet@wanadoo.fr Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-bcm63xx-hsspi.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -367,7 +367,6 @@ static int bcm63xx_hsspi_probe(struct pl goto out_disable_clk; rate = clk_get_rate(pll_clk); - clk_disable_unprepare(pll_clk); if (!rate) { ret = -EINVAL; goto out_disable_pll_clk;