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

Commit c94df495 authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

spi/bcm63xx: inline bcm63xx_spi_check_transfer 



It only does one check, so just do the check directly in the caller.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 31e4eaaa

drivers/spi/spi-bcm63xx.c

+5 −14
Original line number Original line Diff line number Diff line
@@ -93,18 +93,6 @@ static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = { 
	{   391000, SPI_CLK_0_391MHZ }

	{   391000, SPI_CLK_0_391MHZ }

};

};





static int bcm63xx_spi_check_transfer(struct spi_device *spi,

					struct spi_transfer *t)

{

	if (t->bits_per_word != 8) {

		dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",

			__func__, t->bits_per_word);

		return -EINVAL;

	}



	return 0;

}



static void bcm63xx_spi_setup_transfer(struct spi_device *spi,

static void bcm63xx_spi_setup_transfer(struct spi_device *spi,

				      struct spi_transfer *t)

				      struct spi_transfer *t)

{

{
@@ -293,9 +281,12 @@ static int bcm63xx_spi_transfer_one(struct spi_master *master, 
	 * full-duplex transfers.

	 * full-duplex transfers.

	 */

	 */

	list_for_each_entry(t, &m->transfers, transfer_list) {

	list_for_each_entry(t, &m->transfers, transfer_list) {

		status = bcm63xx_spi_check_transfer(spi, t);

		if (t->bits_per_word != 8) {

		if (status < 0)

			dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",

				__func__, t->bits_per_word);

			status = -EINVAL;

			goto exit;

			goto exit;

		}





		if (!first)

		if (!first)

			first = t;

			first = t;