xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: dataflash: Improve coding style in jedec_probe()

Browse Source 
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: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: linux-kernel@vger.kernel.org
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Chris Healy <cphealy@gmail.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Andrey Smirnov
2017-04-21 09:30:22 -07:00
committed by Brian Norris
parent c41e43c6fa
commit 41c9c6621a
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/mtd/devices/mtd_dataflash.c
View File

@@ -82,6 +82,7 @@
#define OP_WRITE_SECURITY_REVC 0x9A #define OP_WRITE_SECURITY_REVC 0x9A
#define OP_WRITE_SECURITY 0x9B /* revision D */ #define OP_WRITE_SECURITY 0x9B /* revision D */
#define CFI_MFR_ATMEL 0x1F
struct dataflash { struct dataflash {
u8 command[4]; u8 command[4];
@@ -738,14 +739,15 @@ static struct flash_info dataflash_data[] = {
static struct flash_info *jedec_probe(struct spi_device *spi) static struct flash_info *jedec_probe(struct spi_device *spi)
{ {
int tmp; int ret, i;
u8 code = OP_READ_ID; u8 code = OP_READ_ID;
u8 id[3]; u8 id[3];
u32 jedec; u32 jedec;
struct flash_info *info; struct flash_info *info;
int status; 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 * string for after vendor-specific data, after the three bytes
* we use here. Supporting some chips might require using it. * 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 * That's not an error; only rev C and newer chips handle it, and
* only Atmel sells these chips. * only Atmel sells these chips.
*/ */
tmp = spi_write_then_read(spi, &code, 1, id, 3); ret = spi_write_then_read(spi, &code, 1, id, 3);
if (tmp < 0) { if (ret < 0) {
pr_debug("%s: error %d reading JEDEC ID\n", pr_debug("%s: error %d reading JEDEC ID\n",
dev_name(&spi->dev), tmp); dev_name(&spi->dev), ret);
return ERR_PTR(tmp); return ERR_PTR(ret);
} }
if (id[0] != 0x1f)
if (id[0] != CFI_MFR_ATMEL)
return NULL; return NULL;
jedec = id[0]; jedec = id[0];
@@ -768,9 +771,9 @@ static struct flash_info *jedec_probe(struct spi_device *spi)
jedec = jedec << 8; jedec = jedec << 8;
jedec |= id[2]; jedec |= id[2];
for (tmp = 0, info = dataflash_data; for (i = 0, info = dataflash_data;
tmp < ARRAY_SIZE(dataflash_data); i < ARRAY_SIZE(dataflash_data);
tmp++, info++) { i++, info++) {
if (info->jedec_id == jedec) { if (info->jedec_id == jedec) {
pr_debug("%s: OTP, sector protect%s\n", pr_debug("%s: OTP, sector protect%s\n",
dev_name(&spi->dev), dev_name(&spi->dev),