Commit 8792b0a0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ulf Hansson
Browse files

mmc: slot-gpio: Update default label when no con_id provided 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210929111757.52625-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4877b81f

drivers/mmc/core/slot-gpio.c

+8 −0
Original line number Diff line number Diff line
@@ -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)