p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spi: Make several public functions private to spi.c 

All these functions have no callers apart from drivers/spi/spi.c. So
drop their declarations in include/linux/spi/spi.h and don't export
them.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211007121415.2401638-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Uwe Kleine-König 2021-10-07 14:14:15 +02:00 committed by Mark Brown
parent fb51601bdf
commit da21fde0fd
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 14 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/spi/spi.c
View File

@ -285,9 +285,9 @@ static const struct attribute_group *spi_master_groups[] = {
NULL, NULL,
}; };
void spi_statistics_add_transfer_stats(struct spi_statistics *stats, static void spi_statistics_add_transfer_stats(struct spi_statistics *stats,
struct spi_transfer *xfer, struct spi_transfer *xfer,
struct spi_controller *ctlr) struct spi_controller *ctlr)
{ {
unsigned long flags; unsigned long flags;
int l2len = min(fls(xfer->len), SPI_STATISTICS_HISTO_SIZE) - 1; int l2len = min(fls(xfer->len), SPI_STATISTICS_HISTO_SIZE) - 1;
@ -310,7 +310,6 @@ void spi_statistics_add_transfer_stats(struct spi_statistics *stats,
spin_unlock_irqrestore(&stats->lock, flags); spin_unlock_irqrestore(&stats->lock, flags);
} }
EXPORT_SYMBOL_GPL(spi_statistics_add_transfer_stats);
/* modalias support makes "modprobe $MODALIAS" new-style hotplug work, /* modalias support makes "modprobe $MODALIAS" new-style hotplug work,
* and the sysfs version makes coldplug work too. * and the sysfs version makes coldplug work too.
@ -501,7 +500,7 @@ static DEFINE_MUTEX(spi_add_lock);
* *
* Return: a pointer to the new device, or NULL. * Return: a pointer to the new device, or NULL.
*/ */
struct spi_device *spi_alloc_device(struct spi_controller *ctlr) static struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
{ {
struct spi_device *spi; struct spi_device *spi;
@ -526,7 +525,6 @@ struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
device_initialize(&spi->dev); device_initialize(&spi->dev);
return spi; return spi;
} }
EXPORT_SYMBOL_GPL(spi_alloc_device);
static void spi_dev_set_name(struct spi_device *spi) static void spi_dev_set_name(struct spi_device *spi)
{ {
@ -621,7 +619,7 @@ static int __spi_add_device(struct spi_device *spi)
* *
* Return: 0 on success; negative errno on failure * Return: 0 on success; negative errno on failure
*/ */
int spi_add_device(struct spi_device *spi) static int spi_add_device(struct spi_device *spi)
{ {
struct spi_controller *ctlr = spi->controller; struct spi_controller *ctlr = spi->controller;
struct device *dev = ctlr->dev.parent; struct device *dev = ctlr->dev.parent;
@ -642,7 +640,6 @@ int spi_add_device(struct spi_device *spi)
mutex_unlock(&spi_add_lock); mutex_unlock(&spi_add_lock);
return status; return status;
} }
EXPORT_SYMBOL_GPL(spi_add_device);
static int spi_add_device_locked(struct spi_device *spi) static int spi_add_device_locked(struct spi_device *spi)
{ {
@ -833,9 +830,8 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
* This may get enhanced in the future to allocate from a memory pool * This may get enhanced in the future to allocate from a memory pool
* of the @spi_device or @spi_controller to avoid repeated allocations. * of the @spi_device or @spi_controller to avoid repeated allocations.
*/ */
void *spi_res_alloc(struct spi_device *spi, static void *spi_res_alloc(struct spi_device *spi, spi_res_release_t release,
spi_res_release_t release, size_t size, gfp_t gfp)
size_t size, gfp_t gfp)
{ {
struct spi_res *sres; struct spi_res *sres;
@ -848,14 +844,13 @@ void *spi_res_alloc(struct spi_device *spi,
return sres->data; return sres->data;
} }
EXPORT_SYMBOL_GPL(spi_res_alloc);
/** /**
* spi_res_free - free an spi resource * spi_res_free - free an spi resource
* @res: pointer to the custom data of a resource * @res: pointer to the custom data of a resource
* *
*/ */
void spi_res_free(void *res) static void spi_res_free(void *res)
{ {
struct spi_res *sres = container_of(res, struct spi_res, data); struct spi_res *sres = container_of(res, struct spi_res, data);
@ -865,28 +860,26 @@ void spi_res_free(void *res)
WARN_ON(!list_empty(&sres->entry)); WARN_ON(!list_empty(&sres->entry));
kfree(sres); kfree(sres);
} }
EXPORT_SYMBOL_GPL(spi_res_free);
/** /**
* spi_res_add - add a spi_res to the spi_message * spi_res_add - add a spi_res to the spi_message
* @message: the spi message * @message: the spi message
* @res: the spi_resource * @res: the spi_resource
*/ */
void spi_res_add(struct spi_message *message, void *res) static void spi_res_add(struct spi_message *message, void *res)
{ {
struct spi_res *sres = container_of(res, struct spi_res, data); struct spi_res *sres = container_of(res, struct spi_res, data);
WARN_ON(!list_empty(&sres->entry)); WARN_ON(!list_empty(&sres->entry));
list_add_tail(&sres->entry, &message->resources); list_add_tail(&sres->entry, &message->resources);
} }
EXPORT_SYMBOL_GPL(spi_res_add);
/** /**
* spi_res_release - release all spi resources for this message * spi_res_release - release all spi resources for this message
* @ctlr: the @spi_controller * @ctlr: the @spi_controller
* @message: the @spi_message * @message: the @spi_message
*/ */
void spi_res_release(struct spi_controller *ctlr, struct spi_message *message) static void spi_res_release(struct spi_controller *ctlr, struct spi_message *message)
{ {
struct spi_res *res, *tmp; struct spi_res *res, *tmp;
@ -899,7 +892,6 @@ void spi_res_release(struct spi_controller *ctlr, struct spi_message *message)
kfree(res); kfree(res);
} }
} }
EXPORT_SYMBOL_GPL(spi_res_release);
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -3157,7 +3149,7 @@ static void __spi_replace_transfers_release(struct spi_controller *ctlr,
* Returns: pointer to @spi_replaced_transfers, * Returns: pointer to @spi_replaced_transfers,
* PTR_ERR(...) in case of errors. * PTR_ERR(...) in case of errors.
*/ */
struct spi_replaced_transfers *spi_replace_transfers( static struct spi_replaced_transfers *spi_replace_transfers(
struct spi_message *msg, struct spi_message *msg,
struct spi_transfer *xfer_first, struct spi_transfer *xfer_first,
size_t remove, size_t remove,
@ -3249,7 +3241,6 @@ struct spi_replaced_transfers *spi_replace_transfers(
return rxfer; return rxfer;
} }
EXPORT_SYMBOL_GPL(spi_replace_transfers);
static int __spi_split_transfer_maxsize(struct spi_controller *ctlr, static int __spi_split_transfer_maxsize(struct spi_controller *ctlr,
struct spi_message *msg, struct spi_message *msg,
@ -3799,7 +3790,7 @@ EXPORT_SYMBOL_GPL(spi_async);
* *
* Return: zero on success, else a negative error code. * Return: zero on success, else a negative error code.
*/ */
int spi_async_locked(struct spi_device *spi, struct spi_message *message) static int spi_async_locked(struct spi_device *spi, struct spi_message *message)
{ {
struct spi_controller *ctlr = spi->controller; struct spi_controller *ctlr = spi->controller;
int ret; int ret;
@ -3818,7 +3809,6 @@ int spi_async_locked(struct spi_device *spi, struct spi_message *message)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(spi_async_locked);
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -4076,18 +4066,15 @@ EXPORT_SYMBOL_GPL(spi_write_then_read);
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF_DYNAMIC)
/* must call put_device() when done with returned spi_device device */ /* must call put_device() when done with returned spi_device device */
struct spi_device *of_find_spi_device_by_node(struct device_node *node) static struct spi_device *of_find_spi_device_by_node(struct device_node *node)
{ {
struct device *dev = bus_find_device_by_of_node(&spi_bus_type, node); struct device *dev = bus_find_device_by_of_node(&spi_bus_type, node);
return dev ? to_spi_device(dev) : NULL; return dev ? to_spi_device(dev) : NULL;
} }
EXPORT_SYMBOL_GPL(of_find_spi_device_by_node);
#endif /* IS_ENABLED(CONFIG_OF) */
#if IS_ENABLED(CONFIG_OF_DYNAMIC)
/* the spi controllers are not using spi_bus, so we find it with another way */ /* the spi controllers are not using spi_bus, so we find it with another way */
static struct spi_controller *of_find_spi_controller_by_node(struct device_node *node) static struct spi_controller *of_find_spi_controller_by_node(struct device_node *node)
{ {

53
include/linux/spi/spi.h
View File

@ -78,10 +78,6 @@ struct spi_statistics {
unsigned long transfers_split_maxsize; unsigned long transfers_split_maxsize;
}; };
void spi_statistics_add_transfer_stats(struct spi_statistics *stats,
struct spi_transfer *xfer,
struct spi_controller *ctlr);
#define SPI_STATISTICS_ADD_TO_FIELD(stats, field, count) \ #define SPI_STATISTICS_ADD_TO_FIELD(stats, field, count) \
do { \ do { \
unsigned long flags; \ unsigned long flags; \
@ -783,15 +779,6 @@ struct spi_res {
unsigned long long data[]; /* guarantee ull alignment */ unsigned long long data[]; /* guarantee ull alignment */
}; };
extern void *spi_res_alloc(struct spi_device *spi,
spi_res_release_t release,
size_t size, gfp_t gfp);
extern void spi_res_add(struct spi_message *message, void *res);
extern void spi_res_free(void *res);
extern void spi_res_release(struct spi_controller *ctlr,
struct spi_message *message);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
@ -1109,8 +1096,6 @@ static inline void spi_message_free(struct spi_message *m)
extern int spi_setup(struct spi_device *spi); extern int spi_setup(struct spi_device *spi);
extern int spi_async(struct spi_device *spi, struct spi_message *message); extern int spi_async(struct spi_device *spi, struct spi_message *message);
extern int spi_async_locked(struct spi_device *spi,
struct spi_message *message);
extern int spi_slave_abort(struct spi_device *spi); extern int spi_slave_abort(struct spi_device *spi);
static inline size_t static inline size_t
@ -1193,15 +1178,6 @@ struct spi_replaced_transfers {
struct spi_transfer inserted_transfers[]; struct spi_transfer inserted_transfers[];
}; };
extern struct spi_replaced_transfers *spi_replace_transfers(
struct spi_message *msg,
struct spi_transfer *xfer_first,
size_t remove,
size_t insert,
spi_replaced_release_t release,
size_t extradatasize,
gfp_t gfp);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* SPI transfer transformation methods */ /* SPI transfer transformation methods */
@ -1473,19 +1449,7 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
* use spi_new_device() to describe each device. You can also call * use spi_new_device() to describe each device. You can also call
* spi_unregister_device() to start making that device vanish, but * spi_unregister_device() to start making that device vanish, but
* normally that would be handled by spi_unregister_controller(). * normally that would be handled by spi_unregister_controller().
*
* You can also use spi_alloc_device() and spi_add_device() to use a two
* stage registration sequence for each spi_device. This gives the caller
* some more control over the spi_device structure before it is registered,
* but requires that caller to initialize fields that would otherwise
* be defined using the board info.
*/ */
extern struct spi_device *
spi_alloc_device(struct spi_controller *ctlr);
extern int
spi_add_device(struct spi_device *spi);
extern struct spi_device * extern struct spi_device *
spi_new_device(struct spi_controller *, struct spi_board_info *); spi_new_device(struct spi_controller *, struct spi_board_info *);
@ -1500,23 +1464,6 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
return list_is_last(&xfer->transfer_list, &ctlr->cur_msg->transfers); return list_is_last(&xfer->transfer_list, &ctlr->cur_msg->transfers);
} }
/* OF support code */
#if IS_ENABLED(CONFIG_OF)
/* must call put_device() when done with returned spi_device device */
extern struct spi_device *
of_find_spi_device_by_node(struct device_node *node);
#else
static inline struct spi_device *
of_find_spi_device_by_node(struct device_node *node)
{
return NULL;
}
#endif /* IS_ENABLED(CONFIG_OF) */
/* Compatibility layer */ /* Compatibility layer */
#define spi_master spi_controller #define spi_master spi_controller