* [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry
@ 2014-08-07 7:47 Rafał Miłecki
2014-08-07 7:47 ` [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function Rafał Miłecki
2014-08-09 11:03 ` [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Huang Shijie
0 siblings, 2 replies; 5+ messages in thread
From: Rafał Miłecki @ 2014-08-07 7:47 UTC (permalink / raw)
To: linux-mtd, David Woodhouse, Artem Bityutskiy, Brian Norris
Cc: Rafał Miłecki
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
This is based on top of
mtd: spi-nor: factor out write_enable() for erase commands
---
drivers/mtd/spi-nor/spi-nor.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index d08d9f8..06fe959 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -613,7 +613,6 @@ const struct spi_device_id spi_nor_ids[] = {
{ "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) },
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
- { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
--
1.8.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function
2014-08-07 7:47 [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Rafał Miłecki
@ 2014-08-07 7:47 ` Rafał Miłecki
2014-08-09 11:06 ` Huang Shijie
2014-08-09 11:03 ` [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Huang Shijie
1 sibling, 1 reply; 5+ messages in thread
From: Rafał Miłecki @ 2014-08-07 7:47 UTC (permalink / raw)
To: linux-mtd, David Woodhouse, Artem Bityutskiy, Brian Norris
Cc: Rafał Miłecki
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function
2014-08-07 7:47 ` [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function Rafał Miłecki
@ 2014-08-09 11:06 ` Huang Shijie
0 siblings, 0 replies; 5+ messages in thread
From: Huang Shijie @ 2014-08-09 11:06 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Brian Norris, linux-mtd, David Woodhouse, Artem Bityutskiy
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry
2014-08-07 7:47 [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Rafał Miłecki
2014-08-07 7:47 ` [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function Rafał Miłecki
@ 2014-08-09 11:03 ` Huang Shijie
2014-08-16 1:32 ` Brian Norris
1 sibling, 1 reply; 5+ messages in thread
From: Huang Shijie @ 2014-08-09 11:03 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Brian Norris, linux-mtd, David Woodhouse, Artem Bityutskiy
On Thu, Aug 07, 2014 at 09:47:01AM +0200, Rafał Miłecki wrote:
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> This is based on top of
> mtd: spi-nor: factor out write_enable() for erase commands
> ---
> drivers/mtd/spi-nor/spi-nor.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index d08d9f8..06fe959 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -613,7 +613,6 @@ const struct spi_device_id spi_nor_ids[] = {
> { "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) },
> { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
> { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
> - { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
> { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
> { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
> { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
> --
> 1.8.4.5
Acked-by: Huang Shijie <shijie8@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry
2014-08-09 11:03 ` [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Huang Shijie
@ 2014-08-16 1:32 ` Brian Norris
0 siblings, 0 replies; 5+ messages in thread
From: Brian Norris @ 2014-08-16 1:32 UTC (permalink / raw)
To: Huang Shijie
Cc: Rafał Miłecki, linux-mtd, David Woodhouse,
Artem Bityutskiy
On Sat, Aug 09, 2014 at 07:03:45PM +0800, Huang Shijie wrote:
> On Thu, Aug 07, 2014 at 09:47:01AM +0200, Rafał Miłecki wrote:
> > Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> Acked-by: Huang Shijie <shijie8@gmail.com>
Pushed both to l2-mtd.git/next.
Brian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-08-16 1:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-07 7:47 [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Rafał Miłecki
2014-08-07 7:47 ` [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function Rafał Miłecki
2014-08-09 11:06 ` Huang Shijie
2014-08-09 11:03 ` [PATCH 1/2] mtd: spi-nor: remove duplicated w25q128 entry Huang Shijie
2014-08-16 1:32 ` Brian Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox