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

Unverified Commit 46336966 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mark Brown
Browse files

spi: Expose spi_{map,unmap}_buf() for internal use 



spi_{map,unmap}_buf() are needed by the spi-mem logic that is about to
be introduced to prepare data buffer for DMA operations.

Remove the static specifier on these functions and add their prototypes
to drivers/spi/internals.h. We do not export the symbols here because
both SPI_MEM and SPI can't be enabled as modules and we'd like to
prevent controller/device drivers from using these functions.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e1f16b04

drivers/spi/internals.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright (C) 2018 Exceet Electronics GmbH

 * Copyright (C) 2018 Bootlin

 *

 * Author: Boris Brezillon <boris.brezillon@bootlin.com>

 *

 * Helpers needed by the spi or spi-mem logic. Should not be used outside of

 * spi-mem.c and spi.c.

 */



#ifndef __LINUX_SPI_INTERNALS_H

#define __LINUX_SPI_INTERNALS_H



#include <linux/device.h>

#include <linux/dma-direction.h>

#include <linux/scatterlist.h>

#include <linux/spi/spi.h>



#ifdef CONFIG_HAS_DMA

int spi_map_buf(struct spi_controller *ctlr, struct device *dev,

		struct sg_table *sgt, void *buf, size_t len,

		enum dma_data_direction dir);

void spi_unmap_buf(struct spi_controller *ctlr, struct device *dev,

		   struct sg_table *sgt, enum dma_data_direction dir);

#else /* !CONFIG_HAS_DMA */

static inline int spi_map_buf(struct spi_controller *ctlr, struct device *dev,

			      struct sg_table *sgt, void *buf, size_t len,

			      enum dma_data_direction dir)

{

	return -EINVAL;

}



static inline void spi_unmap_buf(struct spi_controller *ctlr,

				 struct device *dev, struct sg_table *sgt,

				 enum dma_data_direction dir)

{

}

#endif /* CONFIG_HAS_DMA */



#endif /* __LINUX_SPI_INTERNALS_H */

drivers/spi/spi.c

+7 −18
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/spi.h>



#include "internals.h"



static DEFINE_IDR(spi_master_idr);



static void spidev_release(struct device *dev)
@@ -740,7 +742,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable) 
}



#ifdef CONFIG_HAS_DMA

static int spi_map_buf(struct spi_controller *ctlr, struct device *dev,

int spi_map_buf(struct spi_controller *ctlr, struct device *dev,

		struct sg_table *sgt, void *buf, size_t len,

		enum dma_data_direction dir)

{
@@ -821,7 +823,7 @@ static int spi_map_buf(struct spi_controller *ctlr, struct device *dev, 
	return 0;

}



static void spi_unmap_buf(struct spi_controller *ctlr, struct device *dev,

void spi_unmap_buf(struct spi_controller *ctlr, struct device *dev,

		   struct sg_table *sgt, enum dma_data_direction dir)

{

	if (sgt->orig_nents) {
@@ -907,19 +909,6 @@ static int __spi_unmap_msg(struct spi_controller *ctlr, struct spi_message *msg) 
	return 0;

}

#else /* !CONFIG_HAS_DMA */

static inline int spi_map_buf(struct spi_controller *ctlr, struct device *dev,

			      struct sg_table *sgt, void *buf, size_t len,

			      enum dma_data_direction dir)

{

	return -EINVAL;

}



static inline void spi_unmap_buf(struct spi_controller *ctlr,

				 struct device *dev, struct sg_table *sgt,

				 enum dma_data_direction dir)

{

}



static inline int __spi_map_msg(struct spi_controller *ctlr,

				struct spi_message *msg)

{