mtd: spi-nor: drop jedec_probe /helper/ function

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=54ea17a597b00e46b3720e75dd7595cd5dfa5670
Commit:     54ea17a597b00e46b3720e75dd7595cd5dfa5670
Parent:     ab75e89c013d8fff8bd8a6e520d184c3da1a4583
Author:     Rafał Miłecki <zajec5 at gmail.com>
AuthorDate: Thu Aug 7 09:47:02 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Aug 19 11:53:10 2014 -0700

    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 at gmail.com>
    Acked-by: Huang Shijie <shijie8 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 2fea172..03e0ab8 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) {