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

Commit 79c452ad authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Brian Norris
Browse files

mtd: spi-nor: remove unused read_xfer/write_xfer hooks 



struct spi_nor_xfer_cfg and read_xfer/write_xfer hooks were never used by
any driver. Do some cleanup by removing them.

Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 730a43fb

include/linux/mtd/spi-nor.h

+0 −35
Original line number Original line Diff line number Diff line
@@ -87,33 +87,6 @@ enum read_mode { 
	SPI_NOR_QUAD,

	SPI_NOR_QUAD,

};

};





/**

 * struct spi_nor_xfer_cfg - Structure for defining a Serial Flash transfer

 * @wren:		command for "Write Enable", or 0x00 for not required

 * @cmd:		command for operation

 * @cmd_pins:		number of pins to send @cmd (1, 2, 4)

 * @addr:		address for operation

 * @addr_pins:		number of pins to send @addr (1, 2, 4)

 * @addr_width:		number of address bytes

 *			(3,4, or 0 for address not required)

 * @mode:		mode data

 * @mode_pins:		number of pins to send @mode (1, 2, 4)

 * @mode_cycles:	number of mode cycles (0 for mode not required)

 * @dummy_cycles:	number of dummy cycles (0 for dummy not required)

 */

struct spi_nor_xfer_cfg {

	u8		wren;

	u8		cmd;

	u8		cmd_pins;

	u32		addr;

	u8		addr_pins;

	u8		addr_width;

	u8		mode;

	u8		mode_pins;

	u8		mode_cycles;

	u8		dummy_cycles;

};



#define SPI_NOR_MAX_CMD_SIZE	8

#define SPI_NOR_MAX_CMD_SIZE	8

enum spi_nor_ops {

enum spi_nor_ops {

	SPI_NOR_OPS_READ = 0,

	SPI_NOR_OPS_READ = 0,
@@ -144,14 +117,11 @@ struct mtd_info; 
 * @flash_read:		the mode of the read

 * @flash_read:		the mode of the read

 * @sst_write_second:	used by the SST write operation

 * @sst_write_second:	used by the SST write operation

 * @flags:		flag options for the current SPI-NOR (SNOR_F_*)

 * @flags:		flag options for the current SPI-NOR (SNOR_F_*)

 * @cfg:		used by the read_xfer/write_xfer

 * @cmd_buf:		used by the write_reg

 * @cmd_buf:		used by the write_reg

 * @prepare:		[OPTIONAL] do some preparations for the

 * @prepare:		[OPTIONAL] do some preparations for the

 *			read/write/erase/lock/unlock operations

 *			read/write/erase/lock/unlock operations

 * @unprepare:		[OPTIONAL] do some post work after the

 * @unprepare:		[OPTIONAL] do some post work after the

 *			read/write/erase/lock/unlock operations

 *			read/write/erase/lock/unlock operations

 * @read_xfer:		[OPTIONAL] the read fundamental primitive

 * @write_xfer:		[OPTIONAL] the writefundamental primitive

 * @read_reg:		[DRIVER-SPECIFIC] read out the register

 * @read_reg:		[DRIVER-SPECIFIC] read out the register

 * @write_reg:		[DRIVER-SPECIFIC] write data to the register

 * @write_reg:		[DRIVER-SPECIFIC] write data to the register

 * @read:		[DRIVER-SPECIFIC] read data from the SPI NOR

 * @read:		[DRIVER-SPECIFIC] read data from the SPI NOR
@@ -176,15 +146,10 @@ struct spi_nor { 
	enum read_mode		flash_read;

	enum read_mode		flash_read;

	bool			sst_write_second;

	bool			sst_write_second;

	u32			flags;

	u32			flags;

	struct spi_nor_xfer_cfg	cfg;

	u8			cmd_buf[SPI_NOR_MAX_CMD_SIZE];

	u8			cmd_buf[SPI_NOR_MAX_CMD_SIZE];





	int (*prepare)(struct spi_nor *nor, enum spi_nor_ops ops);

	int (*prepare)(struct spi_nor *nor, enum spi_nor_ops ops);

	void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops);

	void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops);

	int (*read_xfer)(struct spi_nor *nor, struct spi_nor_xfer_cfg *cfg,

			 u8 *buf, size_t len);

	int (*write_xfer)(struct spi_nor *nor, struct spi_nor_xfer_cfg *cfg,

			  u8 *buf, size_t len);

	int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);

	int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);

	int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);

	int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);