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>

2 files changed, 1 insertions, 6 deletions

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index c51ee52386a7..a98c134e51b6 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -904,8 +904,6 @@ static int spi_nor_check(struct spi_nor *nor)
                 return -EINVAL;
         }
 
-        if (!nor->read_id)
-                nor->read_id = spi_nor_read_id;
         if (!nor->wait_till_ready)
                 nor->wait_till_ready = spi_nor_wait_till_ready;
 
@@ -935,7 +933,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
         if (info->jedec_id) {
                 const struct spi_device_id *jid;
 
-                jid = nor->read_id(nor);
+                jid = spi_nor_read_id(nor);
                 if (IS_ERR(jid)) {
                         return PTR_ERR(jid);
                 } else if (jid != id) {
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 {
  * @write_xfer:         [OPTIONAL] the writefundamental primitive
  * @read_reg:           [DRIVER-SPECIFIC] read out the register
  * @write_reg:          [DRIVER-SPECIFIC] write data to the register
- * @read_id:            [REPLACEABLE] read out the ID data, and find
- *                      the proper spi_device_id
  * @wait_till_ready:    [REPLACEABLE] wait till the NOR becomes ready
  * @read:               [DRIVER-SPECIFIC] read data from the SPI NOR
  * @write:              [DRIVER-SPECIFIC] write data to the SPI NOR
@@ -172,7 +170,6 @@ struct spi_nor {
         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_enable);
-        const struct spi_device_id *(*read_id)(struct spi_nor *nor);
         int (*wait_till_ready)(struct spi_nor *nor);
 
         int (*read)(struct spi_nor *nor, loff_t from,