From patchwork Thu Feb 16 14:39:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Zegan?= X-Patchwork-Id: 9577395 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 4BA0460244 for ; Thu, 16 Feb 2017 15:08:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A0EF28610 for ; Thu, 16 Feb 2017 15:08:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E3CA28612; Thu, 16 Feb 2017 15:08:19 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 9DAE428610 for ; Thu, 16 Feb 2017 15:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932172AbdBPPIR (ORCPT ); Thu, 16 Feb 2017 10:08:17 -0500 Received: from webczatnet.pl ([91.121.100.5]:60946 "EHLO webczatnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932110AbdBPPIR (ORCPT ); Thu, 16 Feb 2017 10:08:17 -0500 Received: from [193.200.46.1] (port=42436 helo=localhost.localdomain) by webczatnet.pl with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ceNFh-0000sZ-Ct; Thu, 16 Feb 2017 15:41:45 +0100 From: =?UTF-8?q?Micha=C5=82=20Zegan?= To: Kevin Hilman Cc: Carlo Caione , Ulf Hansson , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Micha=C5=82=20Zegan?= Subject: [PATCH 0/2] mmc: meson-gx: fix mmc module unloading Date: Thu, 16 Feb 2017 15:39:55 +0100 Message-Id: <20170216143955.1233-1-webczat@webczatnet.pl> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 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 This patch series fixes mmc driver unloading. Previously, unloading meson-gx-mmc module would trigger kernel warnings. Michał Zegan (2): mmc: meson-gx: prevent cfg_div_clk from being disabled on init mmc: meson-gx: remove mmc host on device removal drivers/mmc/host/meson-gx-mmc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 09739352834c..d444b6bfa02b 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -324,11 +324,12 @@ static int meson_mmc_clk_init(struct meson_host *host) writel(cfg, host->regs + SD_EMMC_CFG); ret = clk_prepare_enable(host->cfg_div_clk); - if (!ret) + if (!ret) { ret = meson_mmc_clk_set(host, f_min); - if (!ret) - clk_disable_unprepare(host->cfg_div_clk); + if (ret) + clk_disable_unprepare(host->cfg_div_clk); + } return ret; } -- 2.11.0 From 66bcfa5eb8375f8b7fcd06fd0a83791c0d61f38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zegan?= Date: Thu, 16 Feb 2017 15:08:56 +0100 Subject: [PATCH 2/2] mmc: meson-gx: remove mmc host on device removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mmc host was added in meson_mmc_probe, but never removed in meson_mmc_remove. Fix that by removing the host before deallocating other resources. Signed-off-by: Michał Zegan --- drivers/mmc/host/meson-gx-mmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index d444b6bfa02b..bb83446118a3 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -818,6 +818,8 @@ static int meson_mmc_remove(struct platform_device *pdev) if (WARN_ON(!host)) return 0; + mmc_remove_host(host->mmc); + if (host->bounce_buf) dma_free_coherent(host->dev, host->bounce_buf_size, host->bounce_buf, host->bounce_dma_addr);