Commit 95d79419 authored by Gabor Juhos's avatar Gabor Juhos Committed by Grant Likely
Browse files

spi/ath79: use gpio_request_one 



Use gpio_request_one() instead of multiple gpiolib calls.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent f1e8fc98

drivers/spi/spi-ath79.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ static int ath79_spi_setup_cs(struct spi_device *spi) 
{

{

	struct ath79_spi *sp = ath79_spidev_to_sp(spi);

	struct ath79_spi *sp = ath79_spidev_to_sp(spi);

	struct ath79_spi_controller_data *cdata;

	struct ath79_spi_controller_data *cdata;

	int status;





	cdata = spi->controller_data;

	cdata = spi->controller_data;

	if (spi->chip_select && !cdata)

	if (spi->chip_select && !cdata)
@@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi_device *spi) 
	/* TODO: setup speed? */

	/* TODO: setup speed? */

	ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);

	ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);





	status = 0;

	if (spi->chip_select) {

	if (spi->chip_select) {

		int status = 0;

		unsigned long flags;





		status = gpio_request(cdata->gpio, dev_name(&spi->dev));

		flags = GPIOF_DIR_OUT;

		if (status)

		if (spi->mode & SPI_CS_HIGH)

			return status;

			flags |= GPIOF_INIT_HIGH;

		else

			flags |= GPIOF_INIT_LOW;





		status = gpio_direction_output(cdata->gpio,

		status = gpio_request_one(cdata->gpio, flags,

					       spi->mode & SPI_CS_HIGH);

					  dev_name(&spi->dev));

		if (status) {

			gpio_free(cdata->gpio);

			return status;

		}

	}

	}





	return 0;

	return status;

}

}





static void ath79_spi_cleanup_cs(struct spi_device *spi)

static void ath79_spi_cleanup_cs(struct spi_device *spi)