From patchwork Tue Jun 26 14:51:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10489251 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 D00D86031B for ; Tue, 26 Jun 2018 14:51:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF9902040D for ; Tue, 26 Jun 2018 14:51:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B40DD2624D; Tue, 26 Jun 2018 14:51:46 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 49F3F2040D for ; Tue, 26 Jun 2018 14:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751026AbeFZOvp (ORCPT ); Tue, 26 Jun 2018 10:51:45 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34059 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986AbeFZOvn (ORCPT ); Tue, 26 Jun 2018 10:51:43 -0400 Received: by mail-lf0-f67.google.com with SMTP id n96-v6so5513947lfi.1 for ; Tue, 26 Jun 2018 07:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=serWkojiqyWN6tX8zXmhMtuVS5NvLQN8LZA/cFV0KG4=; b=ZU6yNHXlp928/yawzNxC+8xn/xN0K4Mssg4o1614S4ICrHewBeb4ZXEJwjsveN2bMn u1m5WWo6QjXY8OQkHDLqzujfT6zpU9Gor7i1moaWOz/8KBOsDbtX5H/Y314+Mb79nLLa KF8UOIFukT4rNz9zSRZ+gT8u2WFaoTv8Okepg= 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; bh=serWkojiqyWN6tX8zXmhMtuVS5NvLQN8LZA/cFV0KG4=; b=EN6vP0TB0pJZTg/6H03uYYidt489w6KG19RUL8oUYmQX+9HQRJjZEb12yxtdH7uWA3 utq9vJD4Ey61cke75zNf6nDg047I+/vKrIZoYYDl78dOMTvqu5Un/2dn2M/uDZhBcnsN 0Tw8bdZc3puSOzDM2qqCfxZeMJCzpj9EAL+9HRwCpW6pp5GCi75NFRyZ6XyZtkMMla8f 1iyjGlh/Qoigr9vyRDFUIC/EYgKQRHP0DdQ4IeCdt90IFwb8hvsO17Q9uh9TxQITpnCh yTG2EiMLsiPaLQvuDfT8gw3BfLkCSf12xwKebCPVum9DX3O/wunJIq7NWfrtLQjn7Vxo iSlA== X-Gm-Message-State: APt69E33JGghVVsEASmRu9B7xbkMuW23/2o/ZhEwuCwNGzFwqV9/vd/K u5mKX0YOGifcdyOTQ4VPCD0xx1gCWxg= X-Google-Smtp-Source: AAOMgpcFsfd944Z1JDncbwboYx2lEb2YVTr5pQ3F9nhgkwrDwbbhLmuJLsvyfY8rSv5W2ZdgO+2rhg== X-Received: by 2002:a19:1a52:: with SMTP id a79-v6mr1569041lfa.43.1530024701798; Tue, 26 Jun 2018 07:51:41 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c67-v6sm384724lfe.4.2018.06.26.07.51.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 07:51:40 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Tony Lindgren , Eyal Reizer Subject: [PATCH] mmc: core: Drop the unused mmc_power_save|restore_host() Date: Tue, 26 Jun 2018 16:51:31 +0200 Message-Id: <20180626145131.15935-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 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 last user of mmc_power_save|restore_host() APIs is gone, hence let's drop them. Drop also the corresponding bus_ops callback, ->power_save|restore() as those becomes redundant. Cc: Tony Lindgren Cc: Eyal Reizer Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 46 ---------------------------------------- drivers/mmc/core/core.h | 2 -- drivers/mmc/core/sdio.c | 1 - include/linux/mmc/host.h | 3 --- 4 files changed, 52 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 281826d1fcca..d991f635c18d 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2716,52 +2716,6 @@ void mmc_stop_host(struct mmc_host *host) mmc_release_host(host); } -int mmc_power_save_host(struct mmc_host *host) -{ - int ret = 0; - - pr_debug("%s: %s: powering down\n", mmc_hostname(host), __func__); - - mmc_bus_get(host); - - if (!host->bus_ops || host->bus_dead) { - mmc_bus_put(host); - return -EINVAL; - } - - if (host->bus_ops->power_save) - ret = host->bus_ops->power_save(host); - - mmc_bus_put(host); - - mmc_power_off(host); - - return ret; -} -EXPORT_SYMBOL(mmc_power_save_host); - -int mmc_power_restore_host(struct mmc_host *host) -{ - int ret; - - pr_debug("%s: %s: powering up\n", mmc_hostname(host), __func__); - - mmc_bus_get(host); - - if (!host->bus_ops || host->bus_dead) { - mmc_bus_put(host); - return -EINVAL; - } - - mmc_power_up(host, host->card->ocr); - ret = host->bus_ops->power_restore(host); - - mmc_bus_put(host); - - return ret; -} -EXPORT_SYMBOL(mmc_power_restore_host); - #ifdef CONFIG_PM_SLEEP /* Do the card removal on suspend if card is assumed removeable * Do that in pm notifier while userspace isn't yet frozen, so we will be able diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 9d8f09ac0821..087ba68b2920 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -28,8 +28,6 @@ struct mmc_bus_ops { int (*resume)(struct mmc_host *); int (*runtime_suspend)(struct mmc_host *); int (*runtime_resume)(struct mmc_host *); - int (*power_save)(struct mmc_host *); - int (*power_restore)(struct mmc_host *); int (*alive)(struct mmc_host *); int (*shutdown)(struct mmc_host *); int (*hw_reset)(struct mmc_host *); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index a86490dbca70..d8e17ea6126d 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1076,7 +1076,6 @@ static const struct mmc_bus_ops mmc_sdio_ops = { .resume = mmc_sdio_resume, .runtime_suspend = mmc_sdio_runtime_suspend, .runtime_resume = mmc_sdio_runtime_resume, - .power_restore = mmc_sdio_power_restore, .alive = mmc_sdio_alive, .hw_reset = mmc_sdio_hw_reset, .sw_reset = mmc_sdio_sw_reset, diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 64300a48dcce..3090c188062f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -474,9 +474,6 @@ static inline void *mmc_priv(struct mmc_host *host) #define mmc_classdev(x) (&(x)->class_dev) #define mmc_hostname(x) (dev_name(&(x)->class_dev)) -int mmc_power_save_host(struct mmc_host *host); -int mmc_power_restore_host(struct mmc_host *host); - void mmc_detect_change(struct mmc_host *, unsigned long delay); void mmc_request_done(struct mmc_host *, struct mmc_request *); void mmc_command_done(struct mmc_host *host, struct mmc_request *mrq);