| Message ID | 20170418142127.23301-2-andrew.smirnov@gmail.com |
|---|---|
| State | Accepted |
| Commit | 41c9c6621afa22c86fe74cf07536fd21c7719ca6 |
| Headers | show |
On 04/18/2017 04:21 PM, Andrey Smirnov wrote: > As per request from Marek Vasut, change the following: Does that really have to be in the commit message ? ^_^' > - Replace indentation between type and name of local variable from > tabs to spaces > > - Replace magic number 0x1F with CFI_MFR_ATMEL macro > > - Replace variable 'tmp' with 'ret' and 'i' where appropriate > > - Reformat multi-line comments and add newlines where appropriate > > No functional change intended. Appreciated, thanks! Acked-by: Marek Vasut <marek.vasut@gmail.com> > Cc: cphealy@gmail.com > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Brian Norris <computersforpeace@gmail.com> > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com> > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> > --- > drivers/mtd/devices/mtd_dataflash.c | 31 +++++++++++++++++-------------- > 1 file changed, 17 insertions(+), 14 deletions(-) > > diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c > index a566231..5b7a8c3 100644 > --- a/drivers/mtd/devices/mtd_dataflash.c > +++ b/drivers/mtd/devices/mtd_dataflash.c > @@ -82,6 +82,7 @@ > #define OP_WRITE_SECURITY_REVC 0x9A > #define OP_WRITE_SECURITY 0x9B /* revision D */ > > +#define CFI_MFR_ATMEL 0x1F > > struct dataflash { > u8 command[4]; > @@ -738,14 +739,15 @@ static struct flash_info dataflash_data[] = { > > static struct flash_info *jedec_probe(struct spi_device *spi) > { > - int tmp; > - u8 code = OP_READ_ID; > - u8 id[3]; > - u32 jedec; > - struct flash_info *info; > + int ret, i; > + u8 code = OP_READ_ID; > + u8 id[3]; > + u32 jedec; > + struct flash_info *info; > int status; > > - /* JEDEC also defines an optional "extended device information" > + /* > + * JEDEC also defines an optional "extended device information" > * string for after vendor-specific data, after the three bytes > * we use here. Supporting some chips might require using it. > * > @@ -753,13 +755,14 @@ static struct flash_info *jedec_probe(struct spi_device *spi) > * That's not an error; only rev C and newer chips handle it, and > * only Atmel sells these chips. > */ > - tmp = spi_write_then_read(spi, &code, 1, id, 3); > - if (tmp < 0) { > + ret = spi_write_then_read(spi, &code, 1, id, 3); > + if (ret < 0) { > pr_debug("%s: error %d reading JEDEC ID\n", > - dev_name(&spi->dev), tmp); > - return ERR_PTR(tmp); > + dev_name(&spi->dev), ret); > + return ERR_PTR(ret); > } > - if (id[0] != 0x1f) > + > + if (id[0] != CFI_MFR_ATMEL) > return NULL; > > jedec = id[0]; > @@ -768,9 +771,9 @@ static struct flash_info *jedec_probe(struct spi_device *spi) > jedec = jedec << 8; > jedec |= id[2]; > > - for (tmp = 0, info = dataflash_data; > - tmp < ARRAY_SIZE(dataflash_data); > - tmp++, info++) { > + for (i = 0, info = dataflash_data; > + i < ARRAY_SIZE(dataflash_data); > + i++, info++) { > if (info->jedec_id == jedec) { > pr_debug("%s: OTP, sector protect%s\n", > dev_name(&spi->dev), >
On Tue, 2017-04-18 at 20:25 +0200, Marek Vasut wrote: > On 04/18/2017 04:21 PM, Andrey Smirnov wrote: > > As per request from Marek Vasut, change the following: > > Does that really have to be in the commit message ? ^_^' > > > - Replace indentation between type and name of local variable from > > tabs to spaces > > > > - Replace magic number 0x1F with CFI_MFR_ATMEL macro > > > > - Replace variable 'tmp' with 'ret' and 'i' where appropriate > > > > - Reformat multi-line comments and add newlines where appropriate > > > > No functional change intended. > > Appreciated, thanks! trivia: > > diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c [] > > @@ -768,9 +771,9 @@ static struct flash_info *jedec_probe(struct spi_device *spi) > > jedec = jedec << 8; > > jedec |= id[2]; > > > > - for (tmp = 0, info = dataflash_data; > > - tmp < ARRAY_SIZE(dataflash_data); > > - tmp++, info++) { > > + for (i = 0, info = dataflash_data; > > + i < ARRAY_SIZE(dataflash_data); > > + i++, info++) { > > if (info->jedec_id == jedec) { > > pr_debug("%s: OTP, sector protect%s\n", > > dev_name(&spi->dev), This loop could be written without the i variable. for (info = dataflash_data; info < dataflash_data + ARRAY_SIZE(dataflash_data); info++) {
On 04/19/2017 12:36 AM, Joe Perches wrote: > On Tue, 2017-04-18 at 20:25 +0200, Marek Vasut wrote: >> On 04/18/2017 04:21 PM, Andrey Smirnov wrote: >>> As per request from Marek Vasut, change the following: >> >> Does that really have to be in the commit message ? ^_^' >> >>> - Replace indentation between type and name of local variable from >>> tabs to spaces >>> >>> - Replace magic number 0x1F with CFI_MFR_ATMEL macro >>> >>> - Replace variable 'tmp' with 'ret' and 'i' where appropriate >>> >>> - Reformat multi-line comments and add newlines where appropriate >>> >>> No functional change intended. >> >> Appreciated, thanks! > > trivia: > >>> diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c > [] >>> @@ -768,9 +771,9 @@ static struct flash_info *jedec_probe(struct spi_device *spi) >>> jedec = jedec << 8; >>> jedec |= id[2]; >>> >>> - for (tmp = 0, info = dataflash_data; >>> - tmp < ARRAY_SIZE(dataflash_data); >>> - tmp++, info++) { >>> + for (i = 0, info = dataflash_data; >>> + i < ARRAY_SIZE(dataflash_data); >>> + i++, info++) { >>> if (info->jedec_id == jedec) { >>> pr_debug("%s: OTP, sector protect%s\n", >>> dev_name(&spi->dev), > > This loop could be written without the i variable. > > for (info = dataflash_data; > info < dataflash_data + ARRAY_SIZE(dataflash_data); > info++) { > But in a separate patch please, so it's bisectable. I don't want to slap such change into this patch.
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index a566231..5b7a8c3 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -82,6 +82,7 @@ #define OP_WRITE_SECURITY_REVC 0x9A #define OP_WRITE_SECURITY 0x9B /* revision D */ +#define CFI_MFR_ATMEL 0x1F struct dataflash { u8 command[4]; @@ -738,14 +739,15 @@ static struct flash_info dataflash_data[] = { static struct flash_info *jedec_probe(struct spi_device *spi) { - int tmp; - u8 code = OP_READ_ID; - u8 id[3]; - u32 jedec; - struct flash_info *info; + int ret, i; + u8 code = OP_READ_ID; + u8 id[3]; + u32 jedec; + struct flash_info *info; int status; - /* JEDEC also defines an optional "extended device information" + /* + * JEDEC also defines an optional "extended device information" * string for after vendor-specific data, after the three bytes * we use here. Supporting some chips might require using it. * @@ -753,13 +755,14 @@ static struct flash_info *jedec_probe(struct spi_device *spi) * That's not an error; only rev C and newer chips handle it, and * only Atmel sells these chips. */ - tmp = spi_write_then_read(spi, &code, 1, id, 3); - if (tmp < 0) { + ret = spi_write_then_read(spi, &code, 1, id, 3); + if (ret < 0) { pr_debug("%s: error %d reading JEDEC ID\n", - dev_name(&spi->dev), tmp); - return ERR_PTR(tmp); + dev_name(&spi->dev), ret); + return ERR_PTR(ret); } - if (id[0] != 0x1f) + + if (id[0] != CFI_MFR_ATMEL) return NULL; jedec = id[0]; @@ -768,9 +771,9 @@ static struct flash_info *jedec_probe(struct spi_device *spi) jedec = jedec << 8; jedec |= id[2]; - for (tmp = 0, info = dataflash_data; - tmp < ARRAY_SIZE(dataflash_data); - tmp++, info++) { + for (i = 0, info = dataflash_data; + i < ARRAY_SIZE(dataflash_data); + i++, info++) { if (info->jedec_id == jedec) { pr_debug("%s: OTP, sector protect%s\n", dev_name(&spi->dev),
As per request from Marek Vasut, change the following: - Replace indentation between type and name of local variable from tabs to spaces - Replace magic number 0x1F with CFI_MFR_ATMEL macro - Replace variable 'tmp' with 'ret' and 'i' where appropriate - Reformat multi-line comments and add newlines where appropriate No functional change intended. Cc: cphealy@gmail.com Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Richard Weinberger <richard@nod.at> Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com> Cc: linux-kernel@vger.kernel.org Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> --- drivers/mtd/devices/mtd_dataflash.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)