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

Commit 701c3587 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Mark Brown
Browse files

spi: spi-ep93xx: remove bits_per_word() helper 



Check t->bits_per_word directly and remove the inline helper function.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 8d7586bd

drivers/spi/spi-ep93xx.c

+3 −11
Original line number Diff line number Diff line
@@ -429,17 +429,9 @@ static void ep93xx_spi_chip_setup(const struct ep93xx_spi *espi, 
	ep93xx_spi_write_u16(espi, SSPCR0, cr0);

}



static inline int bits_per_word(const struct ep93xx_spi *espi)

{

	struct spi_message *msg = espi->current_msg;

	struct spi_transfer *t = msg->state;



	return t->bits_per_word;

}



static void ep93xx_do_write(struct ep93xx_spi *espi, struct spi_transfer *t)

{

	if (bits_per_word(espi) > 8) {

	if (t->bits_per_word > 8) {

		u16 tx_val = 0;



		if (t->tx_buf)
@@ -458,7 +450,7 @@ static void ep93xx_do_write(struct ep93xx_spi *espi, struct spi_transfer *t) 


static void ep93xx_do_read(struct ep93xx_spi *espi, struct spi_transfer *t)

{

	if (bits_per_word(espi) > 8) {

	if (t->bits_per_word > 8) {

		u16 rx_val;



		rx_val = ep93xx_spi_read_u16(espi, SSPDR);
@@ -544,7 +536,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_transfer_direction dir) 
	size_t len = t->len;

	int i, ret, nents;



	if (bits_per_word(espi) > 8)

	if (t->bits_per_word > 8)

		buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;

	else

		buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;