diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-09-30 04:15:04 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-10-22 07:29:10 +0200 |
| commit | e66fcf722a74786c500957608f3230e843960b42 (patch) | |
| tree | ff160a4b8f64c0024cfb77d86434584162bb2b29 /drivers | |
| parent | docg3: Fix miuse of seq_printf return value (diff) | |
| download | linux-e66fcf722a74786c500957608f3230e843960b42.tar.xz linux-e66fcf722a74786c500957608f3230e843960b42.zip | |
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 'drivers')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 4 |
1 files changed, 1 insertions, 3 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) { |