From patchwork Wed Feb 15 09:53:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9573677 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 B213A60209 for ; Wed, 15 Feb 2017 09:56:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F54124B44 for ; Wed, 15 Feb 2017 09:56:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93EED2845F; Wed, 15 Feb 2017 09:56:39 +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=unavailable 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 C5D0028466 for ; Wed, 15 Feb 2017 09:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbdBOJym (ORCPT ); Wed, 15 Feb 2017 04:54:42 -0500 Received: from mail-lf0-f50.google.com ([209.85.215.50]:36089 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751532AbdBOJx7 (ORCPT ); Wed, 15 Feb 2017 04:53:59 -0500 Received: by mail-lf0-f50.google.com with SMTP id z134so78427501lff.3 for ; Wed, 15 Feb 2017 01:53:58 -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; bh=cf5nKNpgeo+5Ih0etj4uGueaCp6MFdGbqNuFuUet248=; b=fZMffEqJopzDmJBnJ6WcJ9j+Sq89Ko+7sA738o0JxSAkc3W6/jiSF4Z+lqrzM3YPSG 7o829QtZH9szGcuJrj68c6q5coQJiHq2Y14LTjIRUkDK1c61uGyny4gdvLdWQPnXtpMP bmjB7xBG7TDE1/WDKRXcAn7EwJoISE4kwDvk8= 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=cf5nKNpgeo+5Ih0etj4uGueaCp6MFdGbqNuFuUet248=; b=bsltTBsw5+3Uvf+LIK6vxyR3ahMZvM3ff+t/iRxBRBd8ziEI6lGeGE1X/Ddyr2l1qz K+XPGFCeDJiE0roMvcCaZ04YdIHATuwV5IidvVpsMH8mmd4Mlz9I45F5FoJheGiThi7y 5ckhk55Wsu2T2+B4RsUu+Za8FX6B9ZDmb0FkxyzoANPdgqwQxG3xXd7Xfo5elUHczbjR LswMjBfxtWY7cSCzWxCkryfFi/tSdRUsunFXvqRkbn+ZRVprKKNZisz3MAv6Qfl9lWOy 5qJXe28LvHt9lRWpGxJbk641sJmLgFujj5BsgXRF/G4ScjpFkCGY5uXy9ijaAg45k4ml z5iw== X-Gm-Message-State: AMke39nJ5N8W48QFFT79/zzXYguLQHHXcXq1Fm0LqngPR8+nZGBKNAY6SRGygi86Sz6e/iqK X-Received: by 10.25.145.4 with SMTP id t4mr10499965lfd.171.1487152438064; Wed, 15 Feb 2017 01:53:58 -0800 (PST) Received: from gnarp.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s20sm802234lfg.29.2017.02.15.01.53.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 01:53:56 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter , Paolo Valente Cc: linux-block@vger.kernel.org, Jens Axboe , Christoph Hellwig , Arnd Bergmann , Linus Walleij Subject: [PATCH] mmc: core: make block layer non-optional Date: Wed, 15 Feb 2017 10:53:53 +0100 Message-Id: <20170215095353.23888-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 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 do not know at what point people have wanted to have a system with MMC/SD support without the block layer. We are anyway now so tightly integrated with the block layer that this is onlt teoretical and it makes no sense to have the block layer interface as optional. Signed-off-by: Linus Walleij --- drivers/mmc/core/Kconfig | 12 ------------ drivers/mmc/core/Makefile | 5 ++--- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig index cdfa8520a4b1..2920bc4351ed 100644 --- a/drivers/mmc/core/Kconfig +++ b/drivers/mmc/core/Kconfig @@ -23,19 +23,8 @@ config PWRSEQ_SIMPLE This driver can also be built as a module. If so, the module will be called pwrseq_simple. -config MMC_BLOCK - tristate "MMC block device driver" - depends on BLOCK - default y - help - Say Y here to enable the MMC block device driver support. - This provides a block device driver, which you can use to - mount the filesystem. Almost everyone wishing MMC support - should say Y or M here. - config MMC_BLOCK_MINORS int "Number of minors per block device" - depends on MMC_BLOCK range 4 256 default 8 help @@ -53,7 +42,6 @@ config MMC_BLOCK_MINORS config MMC_BLOCK_BOUNCE bool "Use bounce buffer for simple hosts" - depends on MMC_BLOCK default y help SD/MMC is a high latency protocol where it is crucial to diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index b2a257dc644f..42f0d781d911 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile @@ -7,12 +7,11 @@ mmc_core-y := core.o bus.o host.o \ mmc.o mmc_ops.o sd.o sd_ops.o \ sdio.o sdio_ops.o sdio_bus.o \ sdio_cis.o sdio_io.o sdio_irq.o \ - quirks.o slot-gpio.o + quirks.o slot-gpio.o \ + block.o queue.o mmc_core-$(CONFIG_OF) += pwrseq.o obj-$(CONFIG_PWRSEQ_SIMPLE) += pwrseq_simple.o obj-$(CONFIG_PWRSEQ_EMMC) += pwrseq_emmc.o mmc_core-$(CONFIG_DEBUG_FS) += debugfs.o -obj-$(CONFIG_MMC_BLOCK) += mmc_block.o -mmc_block-objs := block.o queue.o obj-$(CONFIG_MMC_TEST) += mmc_test.o obj-$(CONFIG_SDIO_UART) += sdio_uart.o