From patchwork Tue Feb 14 20:06:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9572697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C57B26058B for ; Tue, 14 Feb 2017 20:07:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C37CD2840E for ; Tue, 14 Feb 2017 20:07:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B80AF28427; Tue, 14 Feb 2017 20:07:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54CEC28420 for ; Tue, 14 Feb 2017 20:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594AbdBNUHu (ORCPT ); Tue, 14 Feb 2017 15:07:50 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33911 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753839AbdBNUHs (ORCPT ); Tue, 14 Feb 2017 15:07:48 -0500 Received: by mail-wm0-f68.google.com with SMTP id c85so5236471wmi.1 for ; Tue, 14 Feb 2017 12:07:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=UwDs3JgtEzPFDPdWPyuPGipBXX4d2mVHKtFd1R+eyJA=; b=a4YdjlkSqtyUs+opgDcQI1UNxnhY9Lm3dgPN8s4NgUf9lvf7TUmVrO0I2k/Y7eKisM FWe+Qi5kUdpL8sL9mw2N/lP4ee+eTHfMLyIhHnx3Pf0wGCNAXslCW5UOebOJI4MjecaA aC5XbzjAomoCdDa0U4qVEEOZOdvZL1qbHShMEeaVy4JzX/5CIKDPsIJiXrXwTvxl5xuP pi+4p+QW4e0T56K3ak4IAmBgf9OT3E4V374WJM5bdg1KcBShtAxbridfDUsi13SbjV6Y E7t4gfufyKLxaD4O4SOprcMSPPg9yaHVgG5Mp2iKZ+ByXvM10P7iNa9KFpUk3Xl0LUnF AHrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=UwDs3JgtEzPFDPdWPyuPGipBXX4d2mVHKtFd1R+eyJA=; b=TRQZYL1K+mZSs2rK1zQdH6KBhfZCl1BZdSllPgrPE9Etl5DyeXmrrz8LOxsYQQtnZL fk9f7EUnPakGdz7JjVZ5fcsS8/lB25tv/+x7vIUuejxkOVHa9BGmTeJG3fpWZfCvAfvT bju4+Dma4FyVuKrt+oQNE1GAN+2LilJLOP9OEkCT4DFvvjl1JThgYlAZSyvq7TbNohGj 0iXW0bObkPvByE+pyDgV1XURqdzd1EbCWiPDji203FYCTEtTbHfDGWURRqVMRd8qOIKK z7eMB9iXlg/WbkwqTe5yqDBpwSuOqUrK91KP9tjlzx4U6WnzubLzXGvoyXH3CzNXruIO y8pA== X-Gm-Message-State: AMke39mbEHelDFiKS+UaFNJYjngnACz/yEXyygWalUg2Y7wxK72fk9sLHxQRmwhTk/7bDg== X-Received: by 10.28.181.145 with SMTP id e139mr4569904wmf.127.1487102867341; Tue, 14 Feb 2017 12:07:47 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:9533:a20:55f1:fb4b? (p200300C6EBDC400095330A2055F1FB4B.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:9533:a20:55f1:fb4b]) by smtp.googlemail.com with ESMTPSA id i189sm4800135wmg.7.2017.02.14.12.07.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 12:07:46 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 13/18] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init To: Ulf Hansson , Kevin Hilman References: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Cc: Carlo Caione , "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: Date: Tue, 14 Feb 2017 21:06:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I don't think this clk_disable_unprepare is right here. We do this in meson_mmc_remove what should be sufficient. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 74ceda75..39904fb5 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -315,11 +315,7 @@ static int meson_mmc_clk_init(struct meson_host *host) /* Get the nearest minimum clock to 400KHz */ host->mmc->f_min = clk_round_rate(host->cfg_div_clk, 400000); - ret = meson_mmc_clk_set(host, host->mmc->f_min); - if (!ret) - clk_disable_unprepare(host->cfg_div_clk); - - return ret; + return meson_mmc_clk_set(host, host->mmc->f_min); } static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)