Skip to content

Commit ea092fb

Browse files
tokunoriBoris Brezillon
tokunori
authored and
Boris Brezillon
committed
mtd: cfi_cmdset_0002: Fix coding style issues
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>
1 parent 237ea0d commit ea092fb

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎drivers/mtd/chips/cfi_cmdset_0002.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444

4545
#define MAX_WORD_RETRIES 3
4646

47-
#define SST49LF004B 0x0060
48-
#define SST49LF040B 0x0050
47+
#define SST49LF004B 0x0060
48+
#define SST49LF040B 0x0050
4949
#define SST49LF008A 0x005a
5050
#define AT49BV6416 0x00d6
5151

@@ -207,7 +207,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd)
207207
struct map_info *map = mtd->priv;
208208
struct cfi_private *cfi = map->fldrv_priv;
209209
if (cfi->cfiq->BufWriteTimeoutTyp) {
210-
pr_debug("Using buffer write method\n" );
210+
pr_debug("Using buffer write method\n");
211211
mtd->_write = cfi_amdstd_write_buffers;
212212
}
213213
}
@@ -1562,7 +1562,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
15621562
* depending of the conditions. The ' + 1' is to avoid having a
15631563
* timeout of 0 jiffies if HZ is smaller than 1000.
15641564
*/
1565-
unsigned long uWriteTimeout = ( HZ / 1000 ) + 1;
1565+
unsigned long uWriteTimeout = (HZ / 1000) + 1;
15661566
int ret = 0;
15671567
map_word oldd;
15681568
int retry_cnt = 0;
@@ -1577,7 +1577,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
15771577
}
15781578

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

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

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

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

18261826
XIP_INVAL_CACHED_RANGE(map, adr, len);
18271827
ENABLE_VPP(map);
@@ -2251,7 +2251,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
22512251
}
22522252

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

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

22982298
if (time_after(jiffies, timeo)) {
22992299
printk(KERN_WARNING "MTD %s(): software timeout\n",
2300-
__func__ );
2300+
__func__);
23012301
break;
23022302
}
23032303

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

23132313
ret = -EIO;
@@ -2340,7 +2340,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
23402340
}
23412341

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

23452345
XIP_INVAL_CACHED_RANGE(map, adr, len);
23462346
ENABLE_VPP(map);
@@ -2389,7 +2389,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
23892389
if (time_after(jiffies, timeo)) {
23902390
xip_enable(map, chip, adr);
23912391
printk(KERN_WARNING "MTD %s(): software timeout\n",
2392-
__func__ );
2392+
__func__);
23932393
break;
23942394
}
23952395

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

24052405
ret = -EIO;

0 commit comments

Comments
 (0)