Re: [PATCH] Revert "mmc: block: don't use parameter prefix if built as module"

From: Ulf Hansson
Date: Thu Feb 11 2016 - 10:58:03 EST


On 11 February 2016 at 16:54, Ulf Hansson <ulf.hansson@xxxxxxxxxx> wrote:
> 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 <john.stultz@xxxxxxxxxx>
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

John, I noticed your regression report. Thanks!

I decided to send this patch and I have already queued it for fixes.

Sorry for not thinking clear when I applied the earlier patch.

Kind regards
Uffe

> ---
> 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
> --
> 1.9.1
>