From patchwork Fri Jan 13 13:14:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9515625 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 9E1D660762 for ; Fri, 13 Jan 2017 13:15:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90D32285A1 for ; Fri, 13 Jan 2017 13:15:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85B6B2866E; Fri, 13 Jan 2017 13:15: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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 2D5A6285A1 for ; Fri, 13 Jan 2017 13:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876AbdAMNPS (ORCPT ); Fri, 13 Jan 2017 08:15:18 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:36051 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562AbdAMNPQ (ORCPT ); Fri, 13 Jan 2017 08:15:16 -0500 Received: by mail-lf0-f51.google.com with SMTP id z134so33628959lff.3 for ; Fri, 13 Jan 2017 05:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dW8BfbemTV4eJp1YptXqjE5EuFx2N0ht4E57bvC8f1w=; b=F3NU8oJASAAU0b6Vt2tbbmdn88nD2amLEyt863TpWIIHeuCSM0AWx+DRhEJYczSTVr dkIT7inaWGZ0lft+KInQdFw4hGzs8Jl3ew6EwrY6JPGr8caKnr4CbRh91SFTOaAGG2u/ /kqZY4hqnYewUWoUlIg4CAlPJoj/IPhpctXms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dW8BfbemTV4eJp1YptXqjE5EuFx2N0ht4E57bvC8f1w=; b=c3hUjV1ZvvFj7qXQIC5utByWiejaa/A6HFSmDNHj90aqYNfDqrMWScT+vGn/Rk28zP h4NHMaXH6YzqypY/XaocRcpI2OzcdOTLRkU9S6j/J8mqONmXsQthOvqPegP0kx+S30S2 1uoAlp8mEY1DJk/RRybOw/dF6g68H97JBuZ63lq543MmHhgEzuVC5rgUDwHKcoq/OW/n QPl1ajMm+NrI747TCQgeYMznUU/1BHAwAcDs1CE4Usrs13PwFbDhhOdMIF/loWbhX7yd zlGSa1gGLkM9pffgnBY+wzpawZpTzaGfPrw66xkOJFWd8oLhGjTNLN1NHdpMlT3vh6a7 AjrQ== X-Gm-Message-State: AIkVDXIjshYztGpxeFwkD4uTicQ+/Joc1vJp69Ysx9qlQdkcQsNhq097CSUAenTZptEzwKve X-Received: by 10.46.72.17 with SMTP id v17mr7132633lja.5.1484313314614; Fri, 13 Jan 2017 05:15:14 -0800 (PST) Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id l67sm2931452lfb.15.2017.01.13.05.15.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jan 2017 05:15:13 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij Subject: [PATCH v3 12/15] mmc: vub300: Don't use mmc_card_present() when validating for inserted card Date: Fri, 13 Jan 2017 14:14:13 +0100 Message-Id: <1484313256-25993-13-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484313256-25993-1-git-send-email-ulf.hansson@linaro.org> References: <1484313256-25993-1-git-send-email-ulf.hansson@linaro.org> 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 mmc_card_present() function helps the mmc core to track an internal state of the card device. More importantly, it's not intended to be used by mmc host drivers to check for an inserted card. Therefore, let's stop using it and instead rely on checking for a valid pointer to a struct mmc_card, as it should be good enough. Signed-off-by: Ulf Hansson Reviewed-by: Linus Walleij --- drivers/mmc/host/vub300.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index 21ea776..c061e7c 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -726,8 +726,7 @@ static void vub300_deadwork_thread(struct work_struct *work) */ } else if (vub300->card_present) { check_vub300_port_status(vub300); - } else if (vub300->mmc && vub300->mmc->card && - mmc_card_present(vub300->mmc->card)) { + } else if (vub300->mmc && vub300->mmc->card) { /* * the MMC core must not have responded * to the previous indication - lets @@ -1754,8 +1753,7 @@ static void vub300_cmndwork_thread(struct work_struct *work) int data_length; mutex_lock(&vub300->cmd_mutex); init_completion(&vub300->command_complete); - if (likely(vub300->vub_name[0]) || !vub300->mmc->card || - !mmc_card_present(vub300->mmc->card)) { + if (likely(vub300->vub_name[0]) || !vub300->mmc->card) { /* * the name of the EMPTY Pseudo firmware file * is used as a flag to indicate that the file