From patchwork Tue Jan 31 20:58: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: 9548515 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 3AC28604DE for ; Tue, 31 Jan 2017 21:08:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D18B280B0 for ; Tue, 31 Jan 2017 21:08:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21C1028304; Tue, 31 Jan 2017 21: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.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 D36FF280B0 for ; Tue, 31 Jan 2017 21:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750897AbdAaVIQ (ORCPT ); Tue, 31 Jan 2017 16:08:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36420 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbdAaVIO (ORCPT ); Tue, 31 Jan 2017 16:08:14 -0500 Received: by mail-wm0-f68.google.com with SMTP id r18so940721wmd.3 for ; Tue, 31 Jan 2017 13:08:14 -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=GbL71AP0F3zCNw3nGC6AZouwoMKS/z4dafG0rySKL1Y=; b=BHqCLJe4WGOlUOHXcHoiBfrKXyszb6tHvDJJrx/HMQTMFuMe1V8awAezuCQvtlcKd7 Q95aCWkg8kkjWYJIIkn8Fvu9GOBkeO4qcZwMxiFdeNeUVTlOJlZQvZ3FV6qMRFjm7jwI Uho4l2u4YYjtTuoL0PWyLjG0oCTdUsv/9F0oLfuqPutKWT7t6l3DN6w21Vn855TFPNP1 HI1mtBI5Fx29gJto3dOwGcg4BWs4i4zdb2JSfmQE9pdXmwA75LWjOWKc3mAZEi26Htso ok9njijiO3Xe3LNjPYE6ZB0pGKUQevFfpWoa/kPMyNAulcI3tI/hnZkgfSbHz44twkGK xP0A== 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=GbL71AP0F3zCNw3nGC6AZouwoMKS/z4dafG0rySKL1Y=; b=EbO2iDrejC8uXldXZ7N1OoCR3dtVqtazl9rzDhtPMlC/RfkSQAJkq0/Ie4bPDvUjC+ ZwrDAu9vkqsq22rB6ykC7weI5y9i+6A3odV/jFUuDxx1J3yoq4dnnrit94XOGVEktq6b 1Uak8AK+dxPAdL1ScLk2b33Tq9jPRoNbzmoBQNMaeA6HHjfg2nDemD9MOTgGrLt2Cr+A 1OtdRqakmxfHbHPRtW2KTK8V0nssABI/428exZAelSwloyR2Vuhi1FNsHO87y9uX4tF0 co+aMLzkxD6b4ANAQobNcPT56eEm/kLH6tMSSB0cZ2ZWVyUP9tJ4TdzdYQzietBgUdCv skJA== X-Gm-Message-State: AIkVDXLQnYoIchlZG8uvH/QhZpbghR8gNyiL8snNtqXhQhUI43o5lwSLWvv6z930sXtBvg== X-Received: by 10.223.164.150 with SMTP id g22mr25318586wrb.148.1485896363830; Tue, 31 Jan 2017 12:59:23 -0800 (PST) Received: from ?IPv6:2003:c6:ebc5:6c00:bc31:e1d5:58cd:f318? (p200300C6EBC56C00BC31E1D558CDF318.dip0.t-ipconnect.de. [2003:c6:ebc5:6c00:bc31:e1d5:58cd:f318]) by smtp.googlemail.com with ESMTPSA id 191sm25872635wmo.21.2017.01.31.12.59.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 12:59:23 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 8/9] mmc: meson-gx: remove unneeded checks in remove To: Ulf Hansson References: <24e8bf35-50ce-270d-c0aa-12bb90d2e3d8@gmail.com> Cc: Carlo Caione , Kevin Hilman , linux-mmc@vger.kernel.org Message-ID: Date: Tue, 31 Jan 2017 21:58:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <24e8bf35-50ce-270d-c0aa-12bb90d2e3d8@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 The remove callback is called only if probe finished successfully. Therefore these checks are not needed. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 48ce4ba4..bc787444 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -811,15 +811,11 @@ static int meson_mmc_remove(struct platform_device *pdev) { struct meson_host *host = dev_get_drvdata(&pdev->dev); - if (WARN_ON(!host)) - return 0; - /* disable interrupts */ writel(0, host->regs + SD_EMMC_IRQ_EN); - if (host->bounce_buf) - dma_free_coherent(host->dev, host->bounce_buf_size, - host->bounce_buf, host->bounce_dma_addr); + dma_free_coherent(host->dev, host->bounce_buf_size, + host->bounce_buf, host->bounce_dma_addr); clk_disable_unprepare(host->cfg_div_clk); clk_disable_unprepare(host->core_clk);