Commit fbd03d27 authored by Michael Walle's avatar Michael Walle Committed by Greg Kroah-Hartman
Browse files

nvmem: core: move struct nvmem_cell_info to nvmem-provider.h 



struct nvmem_cell_info is used to describe a cell. Thus this should
really be in the nvmem-provider's header. There are two (unused) nvmem
access methods which use the nvmem_cell_info to describe the cell to be
accesses. One can argue, that they will create a cell before accessing,
thus they are both a provider and a consumer.

struct nvmem_cell_info will get used more and more by nvmem-providers,
don't force them to also include the consumer header, although they are
not.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230206134356.839737-14-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d8e6e6c

include/linux/nvmem-consumer.h

+1 −9
Original line number Diff line number Diff line
@@ -18,15 +18,7 @@ struct device_node; 
/* consumer cookie */

struct nvmem_cell;

struct nvmem_device;



struct nvmem_cell_info {

	const char		*name;

	unsigned int		offset;

	unsigned int		bytes;

	unsigned int		bit_offset;

	unsigned int		nbits;

	struct device_node	*np;

};

struct nvmem_cell_info;



/**

 * struct nvmem_cell_lookup - cell lookup entry

include/linux/nvmem-provider.h

+18 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/gpio/consumer.h>



struct nvmem_device;

struct nvmem_cell_info;

typedef int (*nvmem_reg_read_t)(void *priv, unsigned int offset,

				void *val, size_t bytes);

typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset,
@@ -47,6 +46,24 @@ struct nvmem_keepout { 
	unsigned char value;

};



/**

 * struct nvmem_cell_info - NVMEM cell description

 * @name:	Name.

 * @offset:	Offset within the NVMEM device.

 * @bytes:	Length of the cell.

 * @bit_offset:	Bit offset if cell is smaller than a byte.

 * @nbits:	Number of bits.

 * @np:		Optional device_node pointer.

 */

struct nvmem_cell_info {

	const char		*name;

	unsigned int		offset;

	unsigned int		bytes;

	unsigned int		bit_offset;

	unsigned int		nbits;

	struct device_node	*np;

};



/**

 * struct nvmem_config - NVMEM device configuration

 *