Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 22188664 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Mark Brown
Browse files

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: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19

drivers/spi/spi-pxa2xx.c

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

}