diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-08-27 13:00:50 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-09 14:25:14 +0200 |
| commit | 9fbc695075e905b9201100860eacac6349db6644 (patch) | |
| tree | 3cfecf3becf2d80be974cb22626e323be4cfbb21 /drivers/mmc | |
| parent | f5b4d71f72c5f08c2e1d0af68ef881f85537e7a1 (diff) | |
| download | linux-rpi-9fbc695075e905b9201100860eacac6349db6644.tar.gz linux-rpi-9fbc695075e905b9201100860eacac6349db6644.tar.bz2 linux-rpi-9fbc695075e905b9201100860eacac6349db6644.zip | |
mmc: slot-gpio: switch to use flags when getting GPIO
When the slot GPIO driver gets the GPIO to be used for card
detect, it is now possible to specify a flag to have the line
set up as input. Get rid of the explicit setup call for input
and use the flag.
The extra argument works as there are transition varargs
macros in place in the <linux/gpio/consumer.h> header, in
the future we will make the flags argument compulsory.
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/slot-gpio.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index 5f89cb83d5f0..908c2b29e79f 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -308,14 +308,10 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, if (!con_id) con_id = ctx->cd_label; - desc = devm_gpiod_get_index(host->parent, con_id, idx); + desc = devm_gpiod_get_index(host->parent, con_id, idx, GPIOD_IN); if (IS_ERR(desc)) return PTR_ERR(desc); - ret = gpiod_direction_input(desc); - if (ret < 0) - return ret; - if (debounce) { ret = gpiod_set_debounce(desc, debounce); if (ret < 0) |