| Message ID | 20210929111757.52625-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/2] mmc: slot-gpio: Refactor mmc_gpio_alloc() | expand |
On Wed, 29 Sept 2021 at 13:17, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Currently default label of GPIO is assigned to the device name, > when no con_id provided. Instead, let's update it to reflect > what it's about (use already prepared template). > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/slot-gpio.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c > index e365d328f43c..dd2a4b6ab6ad 100644 > --- a/drivers/mmc/core/slot-gpio.c > +++ b/drivers/mmc/core/slot-gpio.c > @@ -178,6 +178,10 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, > if (IS_ERR(desc)) > return PTR_ERR(desc); > > + /* Update default label if no con_id provided */ > + if (!con_id) > + gpiod_set_consumer_name(desc, ctx->cd_label); > + > if (debounce) { > ret = gpiod_set_debounce(desc, debounce); > if (ret < 0) > @@ -226,6 +230,10 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, > if (IS_ERR(desc)) > return PTR_ERR(desc); > > + /* Update default label if no con_id provided */ > + if (!con_id) > + gpiod_set_consumer_name(desc, ctx->ro_label); > + > if (debounce) { > ret = gpiod_set_debounce(desc, debounce); > if (ret < 0) > -- > 2.33.0 >
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index e365d328f43c..dd2a4b6ab6ad 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -178,6 +178,10 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, if (IS_ERR(desc)) return PTR_ERR(desc); + /* Update default label if no con_id provided */ + if (!con_id) + gpiod_set_consumer_name(desc, ctx->cd_label); + if (debounce) { ret = gpiod_set_debounce(desc, debounce); if (ret < 0) @@ -226,6 +230,10 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, if (IS_ERR(desc)) return PTR_ERR(desc); + /* Update default label if no con_id provided */ + if (!con_id) + gpiod_set_consumer_name(desc, ctx->ro_label); + if (debounce) { ret = gpiod_set_debounce(desc, debounce); if (ret < 0)
Currently default label of GPIO is assigned to the device name, when no con_id provided. Instead, let's update it to reflect what it's about (use already prepared template). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mmc/core/slot-gpio.c | 8 ++++++++ 1 file changed, 8 insertions(+)