diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2014-08-07 09:47:02 +0200 |
|---|---|---|
| committer |   Brian Norris <computersforpeace@gmail.com> | 2014-08-19 11:53:10 -0700 |
| commit | 54ea17a597b00e46b3720e75dd7595cd5dfa5670 (patch) | |
| tree | 4295d8e856cabc90d51745f74cf25f950c215971 /drivers/mtd/spi-nor | |
| parent | mtd: spi-nor: remove duplicated w25q128 entry (diff) | |
| download | linux-dev-54ea17a597b00e46b3720e75dd7595cd5dfa5670.tar.xz linux-dev-54ea17a597b00e46b3720e75dd7595cd5dfa5670.zip | |
mtd: spi-nor: drop jedec_probe /helper/ function
It's a one-liner doing no magic and its name may be confusing because
it does not have to use JEDEC (e.g. when using alternative read_id).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/spi-nor')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 7 |
1 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 2fea172dd530..03e0ab8b2086 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -671,11 +671,6 @@ static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) return ERR_PTR(-ENODEV); } -static const struct spi_device_id *jedec_probe(struct spi_nor *nor) -{ - return nor->read_id(nor); -} - static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { @@ -958,7 +953,7 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id, if (info->jedec_id) { const struct spi_device_id *jid; - jid = jedec_probe(nor); + jid = nor->read_id(nor); if (IS_ERR(jid)) { return PTR_ERR(jid); } else if (jid != id) { |