Re: [PATCH v1 2/2] mmc: slot-gpio: Don't override con_id when request descriptor

Ulf Hansson
2017-01-12T12:00:40Z

On 2 January 2017 at 13:05, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> The caller may supply connection ID, index, or both. All combinations are
> possible and mmc framework should not make any assumption on what exactly
> caller wants.
>
> Remove con_id override conditionals in mmc_gpiod_request_ro() and
> mmc_gpiod_request_cd().
>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
> drivers/mmc/core/slot-gpio.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
> index babe591aea96..a8450a8701e4 100644
> --- a/drivers/mmc/core/slot-gpio.c
> +++ b/drivers/mmc/core/slot-gpio.c
> @@ -235,9 +235,6 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
> struct gpio_desc *desc;
> int ret;
>
> - if (!con_id)
> - con_id = ctx->cd_label;
> -
> desc = devm_gpiod_get_index(host->parent, con_id, idx, GPIOD_IN);
> if (IS_ERR(desc))
> return PTR_ERR(desc);
> @@ -289,9 +286,6 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
> struct gpio_desc *desc;
> int ret;
>
> - if (!con_id)
> - con_id = ctx->ro_label;
> -
> desc = devm_gpiod_get_index(host->parent, con_id, idx, GPIOD_IN);
> if (IS_ERR(desc))
> return PTR_ERR(desc);
> --
> 2.11.0
>