summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.c
diff options
context:
space:
mode:
authorRasmus Villemoes2017-12-21 01:37:31 +0100
committerMark Brown2017-12-21 13:19:02 +0100
commit221886646f75964ca31cf60f1811b2c9c4e965a5 (patch)
tree30b2698c6459c8f57c0848c067cb3f44b4fb95c9 /drivers/spi/spi-pxa2xx.c
parentLinux 4.15-rc1 (diff)
downloadkernel-qcow2-linux-221886646f75964ca31cf60f1811b2c9c4e965a5.tar.gz
kernel-qcow2-linux-221886646f75964ca31cf60f1811b2c9c4e965a5.tar.xz
kernel-qcow2-linux-221886646f75964ca31cf60f1811b2c9c4e965a5.zip
spi: pxa2xx: avoid redundant gpio_to_desc(desc_to_gpio()) round-trip
gpio_free(gpio) simply does gpiod_free(gpio_to_desc(gpio)), so it's simpler and cleaner to use gpiod_free directly. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r--drivers/spi/spi-pxa2xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4cb515a3104c..c209dc1047b5 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1237,7 +1237,7 @@ static int setup_cs(struct spi_device *spi, struct chip_data *chip,
* different chip_info, release previously requested GPIO
*/
if (chip->gpiod_cs) {
- gpio_free(desc_to_gpio(chip->gpiod_cs));
+ gpiod_free(chip->gpiod_cs);
chip->gpiod_cs = NULL;
}
@@ -1417,7 +1417,7 @@ static void cleanup(struct spi_device *spi)
if (drv_data->ssp_type != CE4100_SSP && !drv_data->cs_gpiods &&
chip->gpiod_cs)
- gpio_free(desc_to_gpio(chip->gpiod_cs));
+ gpiod_free(chip->gpiod_cs);
kfree(chip);
}