Skip to content

Commit

Permalink
mtd: cfi_cmdset_0002: Fix coding style issues
Browse files Browse the repository at this point in the history
This patch fixes mainly to remove unneeded spaces after '(' and before ')'.
Also some indentation errors are fixed.

Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
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@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
  • Loading branch information
Tokunori Ikegami authored and Boris Brezillon committed May 12, 2018
1 parent 237ea0d commit ea092fb
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/mtd/chips/cfi_cmdset_0002.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

#define MAX_WORD_RETRIES 3

#define SST49LF004B 0x0060
#define SST49LF040B 0x0050
#define SST49LF004B 0x0060
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
#define AT49BV6416 0x00d6

Expand Down Expand Up @@ -207,7 +207,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd)
struct map_info *map = mtd->priv;
struct cfi_private *cfi = map->fldrv_priv;
if (cfi->cfiq->BufWriteTimeoutTyp) {
pr_debug("Using buffer write method\n" );
pr_debug("Using buffer write method\n");
mtd->_write = cfi_amdstd_write_buffers;
}
}
Expand Down Expand Up @@ -1562,7 +1562,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
* depending of the conditions. The ' + 1' is to avoid having a
* timeout of 0 jiffies if HZ is smaller than 1000.
*/
unsigned long uWriteTimeout = ( HZ / 1000 ) + 1;
unsigned long uWriteTimeout = (HZ / 1000) + 1;
int ret = 0;
map_word oldd;
int retry_cnt = 0;
Expand All @@ -1577,7 +1577,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
}

pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",
__func__, adr, datum.x[0] );
__func__, adr, datum.x[0]);

if (mode == FL_OTP_WRITE)
otp_enter(map, chip, adr, map_bankwidth(map));
Expand Down Expand Up @@ -1643,7 +1643,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
/* Did we succeed? */
if (!chip_good(map, adr, datum)) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
map_write(map, CMD(0xF0), chip->start);
/* FIXME - should have reset delay before continuing */

if (++retry_cnt <= MAX_WORD_RETRIES)
Expand Down Expand Up @@ -1821,7 +1821,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
datum = map_word_load(map, buf);

pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",
__func__, adr, datum.x[0] );
__func__, adr, datum.x[0]);

XIP_INVAL_CACHED_RANGE(map, adr, len);
ENABLE_VPP(map);
Expand Down Expand Up @@ -2251,7 +2251,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
}

pr_debug("MTD %s(): ERASE 0x%.8lx\n",
__func__, chip->start );
__func__, chip->start);

XIP_INVAL_CACHED_RANGE(map, adr, map->size);
ENABLE_VPP(map);
Expand Down Expand Up @@ -2297,7 +2297,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)

if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n",
__func__ );
__func__);
break;
}

Expand All @@ -2307,7 +2307,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
/* Did we succeed? */
if (!chip_good(map, adr, map_word_ff(map))) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
map_write(map, CMD(0xF0), chip->start);
/* FIXME - should have reset delay before continuing */

ret = -EIO;
Expand Down Expand Up @@ -2340,7 +2340,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
}

pr_debug("MTD %s(): ERASE 0x%.8lx\n",
__func__, adr );
__func__, adr);

XIP_INVAL_CACHED_RANGE(map, adr, len);
ENABLE_VPP(map);
Expand Down Expand Up @@ -2389,7 +2389,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
if (time_after(jiffies, timeo)) {
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n",
__func__ );
__func__);
break;
}

Expand All @@ -2399,7 +2399,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
/* Did we succeed? */
if (!chip_good(map, adr, map_word_ff(map))) {
/* reset on all failures. */
map_write( map, CMD(0xF0), chip->start );
map_write(map, CMD(0xF0), chip->start);
/* FIXME - should have reset delay before continuing */

ret = -EIO;
Expand Down

0 comments on commit ea092fb

Please sign in to comment.