Unverified Commit f5accfde authored by Mark Brown's avatar Mark Brown
Browse files

spi: use min_t() to improve code 

Merge series from Qianfeng Rong <rongqianfeng@vivo.com>:

Use min_t() to reduce the code and improve readability.

No functional changes.
parents 9fd5f18c 90179609

drivers/spi/spi-fsl-lpspi.c

+4 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/types.h>

#include <linux/minmax.h>



#define DRIVER_NAME "fsl_lpspi"
@@ -473,10 +474,9 @@ static int fsl_lpspi_setup_transfer(struct spi_controller *controller, 
		fsl_lpspi->tx = fsl_lpspi_buf_tx_u32;

	}



	if (t->len <= fsl_lpspi->txfifosize)

		fsl_lpspi->watermark = t->len;

	else

		fsl_lpspi->watermark = fsl_lpspi->txfifosize;

	fsl_lpspi->watermark = min_t(typeof(fsl_lpspi->watermark),

				     fsl_lpspi->txfifosize,

				     t->len);



	if (fsl_lpspi_can_dma(controller, spi, t))

		fsl_lpspi->usedma = true;

drivers/spi/spi-npcm-fiu.c

+2 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/vmalloc.h>

#include <linux/regmap.h>

#include <linux/of.h>

#include <linux/minmax.h>

#include <linux/spi/spi-mem.h>

#include <linux/mfd/syscon.h>
@@ -498,10 +499,7 @@ static int npcm_fiu_read(struct spi_mem *mem, const struct spi_mem_op *op) 


	do {

		addr = ((u32)op->addr.val + i);

		if (currlen < 16)

			readlen = currlen;

		else

			readlen = 16;

		readlen = min_t(int, currlen, 16);



		buf_ptr = data + i;

		ret = npcm_fiu_uma_read(mem, op, addr, true, buf_ptr,

drivers/spi/spi-pl022.c

+5 −8
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/of.h>

#include <linux/pinctrl/consumer.h>

#include <linux/minmax.h>



/*

 * This macro is used to define some register default values.
@@ -760,10 +761,9 @@ static void setup_dma_scatter(struct pl022 *pl022, 
			 * we just feed in this, else we stuff in as much

			 * as we can.

			 */

			if (bytesleft < (PAGE_SIZE - offset_in_page(bufp)))

				mapbytes = bytesleft;

			else

				mapbytes = PAGE_SIZE - offset_in_page(bufp);

			mapbytes = min_t(int, bytesleft,

					 PAGE_SIZE - offset_in_page(bufp));



			sg_set_page(sg, virt_to_page(bufp),

				    mapbytes, offset_in_page(bufp));

			bufp += mapbytes;
@@ -775,10 +775,7 @@ static void setup_dma_scatter(struct pl022 *pl022, 
	} else {

		/* Map the dummy buffer on every page */

		for_each_sg(sgtab->sgl, sg, sgtab->nents, i) {

			if (bytesleft < PAGE_SIZE)

				mapbytes = bytesleft;

			else

				mapbytes = PAGE_SIZE;

			mapbytes = min_t(int, bytesleft, PAGE_SIZE);

			sg_set_page(sg, virt_to_page(pl022->dummypage),

				    mapbytes, 0);

			bytesleft -= mapbytes;