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: 61782 Delivered-To: patches@linaro.org Received: by 10.112.43.199 with SMTP id y7csp283401lbl; Thu, 11 Feb 2016 07:54:21 -0800 (PST) X-Received: by 10.112.130.133 with SMTP id oe5mr15654869lbb.94.1455206061821; Thu, 11 Feb 2016 07:54:21 -0800 (PST) Return-Path: Received: from mail-lb0-x22e.google.com (mail-lb0-x22e.google.com. [2a00:1450:4010:c04::22e]) by mx.google.com with ESMTPS id cm2si2166998lbb.127.2016.02.11.07.54.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2016 07:54:21 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c04::22e as permitted sender) client-ip=2a00:1450:4010:c04::22e; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c04::22e as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-lb0-x22e.google.com with SMTP id bc4so30144361lbc.2 for ; Thu, 11 Feb 2016 07:54:21 -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=YOBkUVkbqaCYbLpn0RoHmmCoch4LoeUPA5VLx0I420JhdI/mYg0qSOcrlxLvJ+F1cD HdMvV3Q6B7EM2qdeuj1611/3fGfJn+yJcVr0A+XZKnxSRZ/78IOTOYydVQxp60fwZt6n zZB1EUxBbtpm3RxGL60sG9t/HFB42JVLR1LSUN+SN90zP5hLT9UoruVZEmnBBAIlgRWw ZDluPzDBr6OcH2KhnP1P5u2AAjpRtTeRz4SvR255tEJdiagqCT0pURGT+zR6zxF7Np9A IqcMtooH69VPZq95ARzPSE6khTrP2lezrByRrvhPQ6O+Ve9b78ZRdV7NEHsYCl6Aeixj 6G9g== X-Gm-Message-State: AG10YORAFNi5aod5rChwoXSnA7W9I7qPva3he1t48vwZmLsU7pG1aHPTZw0tVlqj0jPjCEtUDvI= X-Received: by 10.112.67.1 with SMTP id j1mr851035lbt.103.1455206061463; Thu, 11 Feb 2016 07:54:21 -0800 (PST) Return-Path: 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 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(-) -- 1.9.1 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