From patchwork Thu Feb 11 15:54:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 8281851 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0F92DBEEE5 for ; Thu, 11 Feb 2016 15:54:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F8C120211 for ; Thu, 11 Feb 2016 15:54:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DC2A200F3 for ; Thu, 11 Feb 2016 15:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751140AbcBKPyX (ORCPT ); Thu, 11 Feb 2016 10:54:23 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:36327 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbcBKPyX (ORCPT ); Thu, 11 Feb 2016 10:54:23 -0500 Received: by mail-lb0-f181.google.com with SMTP id tk3so17756966lbb.3 for ; Thu, 11 Feb 2016 07:54:22 -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=/rhWT4iBmaK+Auemn5PbDF0d3LAWeDIt8Xft9QCdzKc=; b=NhGJLbQ5uOknGrsV65XGJCLjMrFZUSlpWN30W3RyqECLJkfDvmtvkcYMe4wMt6fKXN oub9Gl4/tqSnEtE4ySPPWljw9lSFlhGLv3llB3edMCjW+sXqsYx4Ugev5CJB8o1xER+l K7cs73nZwEfvBrE598YOmzf7zme2C6yWQydYo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/rhWT4iBmaK+Auemn5PbDF0d3LAWeDIt8Xft9QCdzKc=; b=bKVUsUAaYK04TZbiy7KUUu55wYVeqkAYVjxIYZn83zH79kXA+Ip3T5POHcgAc8JBP3 4JQM8UZJDPQOXtotQYU51nAP3rQJE7Cjm4LIeplmhOX+fDQ+vy3bAdGcJspKD9NHGBv9 1fOovH9BdIJTuwF+TwfrWqfI99PzRT23tpzhupOaFkqSqDJpEoyYFEp38+DUo4Fzb52W MQG7oM46rLG+w08+Nr/4HUSC+ld8d7BfPEruuvyspCULw4So9kejRXN4SyTqGf9EMLfC HZA6ornF+MPpP8DLqm0aMtykpNNlJ7059YwLyWafshaw0f5D70v4tqbe3KZDujcowZg4 mdXg== X-Gm-Message-State: AG10YOT5MijLnl0gYwt2T2U4mSARFUIIX2dIENzuqmOT0zYduMAEv1K+pxfbIwjGTfS2CFzF X-Received: by 10.112.67.1 with SMTP id j1mr851035lbt.103.1455206061463; Thu, 11 Feb 2016 07:54:21 -0800 (PST) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id wj2sm1267940lbb.5.2016.02.11.07.54.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Feb 2016 07:54:20 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: linux-kernel@vger.kernel.org, John Stultz , Greg KH , Andy Shevchenko Subject: [PATCH] Revert "mmc: block: don't use parameter prefix if built as module" Date: Thu, 11 Feb 2016 16:54:11 +0100 Message-Id: <1455206051-8633-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 829b6962f7e3cfc06f7c5c26269fd47ad48cf503. Revert this change as it causes a sysfs path to change and therefore introduces and ABI regression. More precisely Android's vold is not being able to access /sys/module/mmcblk/parameters/perdev_minors any more, since the path becomes changed to: "/sys/module/mmc_block/..." Fixes: 829b6962f7e3 ("mmc: block: don't use parameter prefix if built as module") Reported-by: John Stultz Cc: Andy Shevchenko Signed-off-by: Ulf Hansson --- drivers/mmc/card/block.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 951641a..fe207e5 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -47,13 +47,10 @@ #include "queue.h" MODULE_ALIAS("mmc:block"); - -#ifdef KERNEL #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX #endif #define MODULE_PARAM_PREFIX "mmcblk." -#endif #define INAND_CMD38_ARG_EXT_CSD 113 #define INAND_CMD38_ARG_ERASE 0x00