From mboxrd@z Thu Jan 1 00:00:00 1970 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=unavailable 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 71514C10F27 for ; Tue, 10 Mar 2020 13:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A06624649 for ; Tue, 10 Mar 2020 13:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846553; bh=vpZhIUp+F3EInqF6s0EGWeJU4WQkBICg3jGrpxrEyvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V6eTkNPQIUnp1IbWHmjkE2W3DfQmq5fyw6Gy5VfPk3aGlCxO7Q42PRo3W7Py5BHNa xx+ok0S5wXfEcjiFCf+0Qjss6oW/M+ey249apyfWj2mN63hyXJ9xCNowTQqlmoI90p uWkDVVLt4EFr1i1auQn228K7I6Vvd2/Vs5OuqsJQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727994AbgCJNW3 (ORCPT ); Tue, 10 Mar 2020 09:22:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:42540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730254AbgCJNBW (ORCPT ); Tue, 10 Mar 2020 09:01:22 -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 201BC2467D; Tue, 10 Mar 2020 13:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845281; bh=vpZhIUp+F3EInqF6s0EGWeJU4WQkBICg3jGrpxrEyvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=COe2dfPUh7gNhcGGnxd1aPbW4luXvFzoNNlj7+cKTKRr3Ojs2EYo/jetn8iexC7T0 KYpgdeluWk/2FQJspUuEeivEfFrzeCvM3fhWXwHHX6qqxazIGfecIYVR6E3nkfJPG1 /JyI3/EOJTgEu9goVDeC+wTY21dDysm036Kck+M4= 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.5 128/189] spi: bcm63xx-hsspi: Really keep pll clk enabled Date: Tue, 10 Mar 2020 13:39:25 +0100 Message-Id: <20200310123652.720548105@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123639.608886314@linuxfoundation.org> References: <20200310123639.608886314@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ -366,7 +366,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;