| Message ID | 1407397622-9252-2-git-send-email-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | 54ea17a597b00e46b3720e75dd7595cd5dfa5670 |
| Headers | show |
On Thu, Aug 07, 2014 at 09:47:02AM +0200, Rafał Miłecki wrote: > 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> > --- > 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 06fe959..ef45177 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -660,11 +660,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) > { > @@ -939,7 +934,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) { > -- > 1.8.4.5 Acked-by: Huang Shijie <shijie8@gmail.com>
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 06fe959..ef45177 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -660,11 +660,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) { @@ -939,7 +934,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) {
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> --- drivers/mtd/spi-nor/spi-nor.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)