Commit 38d003f1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mark Brown
Browse files

spi: fsl-espi: merge fsl_espi_trans and fsl_espi_do_trans 



Merge both functions to reduce source code size and improve
readability.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 06af115d

drivers/spi/spi-fsl-espi.c

+4 −14
Original line number Diff line number Diff line
@@ -276,11 +276,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) 
	return mpc8xxx_spi->count > 0 ? -EMSGSIZE : 0;

}



static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)

static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans)

{

	struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);

	struct spi_device *spi = m->spi;

	int ret = 0;

	int ret;



	fsl_espi_copy_to_buf(m, mspi);

	fsl_espi_setup_transfer(spi, trans);



	ret = fsl_espi_bufs(spi, trans);
@@ -290,18 +292,6 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) 


	fsl_espi_setup_transfer(spi, NULL);



	return ret;

}



static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans)

{

	struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);

	int ret;



	fsl_espi_copy_to_buf(m, mspi);



	ret = fsl_espi_do_trans(m, trans);



	if (!ret)

		fsl_espi_copy_from_buf(m, mspi);