redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Rafał Miłecki 2014-08-07 09:47:02 +02:00 committed by Brian Norris
parent ab75e89c01
commit 54ea17a597
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/mtd/spi-nor/spi-nor.c
View file

@ -671,11 +671,6 @@ static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor)
return ERR_PTR(-ENODEV); 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, static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf) 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) { if (info->jedec_id) {
const struct spi_device_id *jid; const struct spi_device_id *jid;
jid = jedec_probe(nor); jid = nor->read_id(nor);
if (IS_ERR(jid)) { if (IS_ERR(jid)) {
return PTR_ERR(jid); return PTR_ERR(jid);
} else if (jid != id) { } else if (jid != id) {