aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2017-12-20 19:37:31 -0500
committerMark Brown <broonie@kernel.org>2017-12-21 07:19:02 -0500
commit221886646f75964ca31cf60f1811b2c9c4e965a5 (patch)
tree30b2698c6459c8f57c0848c067cb3f44b4fb95c9
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
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>
-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,
1237 * different chip_info, release previously requested GPIO 1237 * different chip_info, release previously requested GPIO
1238 */ 1238 */
1239 if (chip->gpiod_cs) { 1239 if (chip->gpiod_cs) {
1240 gpio_free(desc_to_gpio(chip->gpiod_cs)); 1240 gpiod_free(chip->gpiod_cs);
1241 chip->gpiod_cs = NULL; 1241 chip->gpiod_cs = NULL;
1242 } 1242 }
1243 1243
@@ -1417,7 +1417,7 @@ static void cleanup(struct spi_device *spi)
1417 1417
1418 if (drv_data->ssp_type != CE4100_SSP && !drv_data->cs_gpiods && 1418 if (drv_data->ssp_type != CE4100_SSP && !drv_data->cs_gpiods &&
1419 chip->gpiod_cs) 1419 chip->gpiod_cs)
1420 gpio_free(desc_to_gpio(chip->gpiod_cs)); 1420 gpiod_free(chip->gpiod_cs);
1421 1421
1422 kfree(chip); 1422 kfree(chip);
1423} 1423}