Hi!

> From: Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
 
> This patch also squashes upstream commit 72e6841608b9 ("spi: spi-mem: Fix
> build error without CONFIG_SPI_MEM")' in the current patch as commit
> 46109648052f ("spi: spi-mem: export spi_mem_default_supports_op()")'
> introduced below build error when built without CONFIG_SPI_MEM:

This puts function definition directly into header file; I don't think
that will work when multiple files include it.

Adding "static inline" is the usual solution for this.

Best regards,
								Pavel

> diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
> index 80db2de83402..253a8d451d4c 100644
> --- a/include/linux/spi/spi-mem.h
> +++ b/include/linux/spi/spi-mem.h
> @@ -239,6 +243,13 @@ spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr,
>  				     struct sg_table *sg)
>  {
>  }
> +
> +bool spi_mem_default_supports_op(struct spi_mem *mem,
> +				 const struct spi_mem_op *op)
> +{
> +	return false;
> +}
> +
>  #endif /* CONFIG_SPI_MEM */
>  
>  int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op);

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany