diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-09-29 22:15:04 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-10-22 01:29:10 -0400 |
| commit | e66fcf722a74786c500957608f3230e843960b42 (patch) | |
| tree | ff160a4b8f64c0024cfb77d86434584162bb2b29 /include/linux/mtd | |
| parent | 8c98d2554f715260efb3e779a9cfe045c4af8aa0 (diff) | |
spi-nor: Remove spi_nor::read_id operation
There is currently no useful way to override the default
implementation of this operation. The returned struct spi_device_id
must have a pointer to struct flash_info in its private data, but this
structure is defined inside spi-nor.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 046a0a2e4c4e..2f27713b3ae1 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h | |||
| @@ -139,8 +139,6 @@ enum spi_nor_ops { | |||
| 139 | * @write_xfer: [OPTIONAL] the writefundamental primitive | 139 | * @write_xfer: [OPTIONAL] the writefundamental primitive |
| 140 | * @read_reg: [DRIVER-SPECIFIC] read out the register | 140 | * @read_reg: [DRIVER-SPECIFIC] read out the register |
| 141 | * @write_reg: [DRIVER-SPECIFIC] write data to the register | 141 | * @write_reg: [DRIVER-SPECIFIC] write data to the register |
| 142 | * @read_id: [REPLACEABLE] read out the ID data, and find | ||
| 143 | * the proper spi_device_id | ||
| 144 | * @wait_till_ready: [REPLACEABLE] wait till the NOR becomes ready | 142 | * @wait_till_ready: [REPLACEABLE] wait till the NOR becomes ready |
| 145 | * @read: [DRIVER-SPECIFIC] read data from the SPI NOR | 143 | * @read: [DRIVER-SPECIFIC] read data from the SPI NOR |
| 146 | * @write: [DRIVER-SPECIFIC] write data to the SPI NOR | 144 | * @write: [DRIVER-SPECIFIC] write data to the SPI NOR |
| @@ -172,7 +170,6 @@ struct spi_nor { | |||
| 172 | int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); | 170 | int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); |
| 173 | int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len, | 171 | int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len, |
| 174 | int write_enable); | 172 | int write_enable); |
| 175 | const struct spi_device_id *(*read_id)(struct spi_nor *nor); | ||
| 176 | int (*wait_till_ready)(struct spi_nor *nor); | 173 | int (*wait_till_ready)(struct spi_nor *nor); |
| 177 | 174 | ||
| 178 | int (*read)(struct spi_nor *nor, loff_t from, | 175 | int (*read)(struct spi_nor *nor, loff_t from, |
