aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/bf537-stamp/nand.c4
-rw-r--r--board/dave/PPChameleonEVB/nand.c2
-rw-r--r--board/nc650/nand.c2
-rw-r--r--board/netstar/nand.c2
-rw-r--r--board/prodrive/alpr/nand.c2
-rw-r--r--board/sc3/sc3nand.c4
-rw-r--r--common/cmd_nand.c2
-rw-r--r--cpu/arm926ejs/davinci/nand.c2
-rw-r--r--drivers/mtd/nand/nand_base.c4
-rw-r--r--drivers/mtd/nand/nand_util.c10
-rw-r--r--include/linux/mtd/nand.h2
11 files changed, 18 insertions, 18 deletions
diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c
index bdf1d6ee4..d90bdd071 100644
--- a/board/bf537-stamp/nand.c
+++ b/board/bf537-stamp/nand.c
@@ -50,7 +50,7 @@ static void bfin_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
if( ctrl & NAND_ALE )
IO_ADDR_W = CFG_NAND_BASE + BFIN_NAND_ALE;
else
- IO_ADDR_W = CFG_NAND_BASE;
+ IO_ADDR_W = CFG_NAND_BASE;
this->IO_ADDR_W = (void __iomem *) IO_ADDR_W;
}
this->IO_ADDR_R = this->IO_ADDR_W;
@@ -59,7 +59,7 @@ static void bfin_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
SSYNC();
if (cmd != NAND_CMD_NONE)
- writeb(cmd, this->IO_ADDR_W);
+ writeb(cmd, this->IO_ADDR_W);
}
int bfin_device_ready(struct mtd_info *mtd)
diff --git a/board/dave/PPChameleonEVB/nand.c b/board/dave/PPChameleonEVB/nand.c
index 4bc4257c8..ea6400c04 100644
--- a/board/dave/PPChameleonEVB/nand.c
+++ b/board/dave/PPChameleonEVB/nand.c
@@ -52,7 +52,7 @@ static void ppchameleonevb_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int
}
if (cmd != NAND_CMD_NONE)
- writeb(cmd, this->IO_ADDR_W);
+ writeb(cmd, this->IO_ADDR_W);
}
diff --git a/board/nc650/nand.c b/board/nc650/nand.c
index faec6053f..f59f5e2c9 100644
--- a/board/nc650/nand.c
+++ b/board/nc650/nand.c
@@ -48,7 +48,7 @@ static void nc650_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
}
if (cmd != NAND_CMD_NONE)
- writeb(cmd, this->IO_ADDR_W);
+ writeb(cmd, this->IO_ADDR_W);
}
#elif defined(CONFIG_IDS852_REV2)
/*
diff --git a/board/netstar/nand.c b/board/netstar/nand.c
index 302d78efe..961c92112 100644
--- a/board/netstar/nand.c
+++ b/board/netstar/nand.c
@@ -46,7 +46,7 @@ static void netstar_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int c
IO_ADDR_W |= MASK_ALE;
}
this->IO_ADDR_W = (void __iomem *) IO_ADDR_W;
-
+
if (cmd != NAND_CMD_NONE)
writeb(cmd, this->IO_ADDR_W);
}
diff --git a/board/prodrive/alpr/nand.c b/board/prodrive/alpr/nand.c
index 3224d3dd6..e1495feea 100644
--- a/board/prodrive/alpr/nand.c
+++ b/board/prodrive/alpr/nand.c
@@ -57,7 +57,7 @@ static struct alpr_ndfc_regs *alpr_ndfc = NULL;
* There are 2 NAND devices on the board, a Hynix HY27US08561A (1 GByte).
*/
static void alpr_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
-{
+{
struct nand_chip *this = mtd->priv;
if (ctrl & NAND_CTRL_CHANGE) {
diff --git a/board/sc3/sc3nand.c b/board/sc3/sc3nand.c
index 2f2e74589..8ead7c850 100644
--- a/board/sc3/sc3nand.c
+++ b/board/sc3/sc3nand.c
@@ -46,7 +46,7 @@ static void sc3_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
if ( ctrl & NAND_CLE )
set_bit (SC3_NAND_CLE, sc3_control_base);
else
- clear_bit (SC3_NAND_CLE, sc3_control_base);
+ clear_bit (SC3_NAND_CLE, sc3_control_base);
if ( ctrl & NAND_ALE )
set_bit (SC3_NAND_ALE, sc3_control_base);
else
@@ -54,7 +54,7 @@ static void sc3_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
if ( ctrl & NAND_NCE )
set_bit (SC3_NAND_CE, sc3_control_base);
else
- clear_bit (SC3_NAND_CE, sc3_control_base);
+ clear_bit (SC3_NAND_CE, sc3_control_base);
}
if (cmd != NAND_CMD_NONE)
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 3e76d8207..f825234a7 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -328,7 +328,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
printf("\nNAND %s: ", read ? "read" : "write");
if (arg_off_size(argc - 3, argv + 3, nand, &off, &size) != 0)
return 1;
-
+
s = strchr(cmd, '.');
if (s != NULL &&
(!strcmp(s, ".jffs2") || !strcmp(s, ".e") || !strcmp(s, ".i"))) {
diff --git a/cpu/arm926ejs/davinci/nand.c b/cpu/arm926ejs/davinci/nand.c
index 43041b635..196fc146b 100644
--- a/cpu/arm926ejs/davinci/nand.c
+++ b/cpu/arm926ejs/davinci/nand.c
@@ -376,7 +376,7 @@ int board_nand_init(struct nand_chip *nand)
// nand->autooob = &davinci_nand_oobinfo;
nand->ecc.calculate = nand_davinci_calculate_ecc;
nand->ecc.correct = nand_davinci_correct_data;
- nand->ecc.hwctl = nand_davinci_enable_hwecc;
+ nand->ecc.hwctl = nand_davinci_enable_hwecc;
#else
nand->ecc.mode = NAND_ECC_SOFT;
#endif
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index aeb179731..e21a18baa 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2080,7 +2080,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
/* Calculate pages in each block */
pages_per_block = 1 << (chip->phys_erase_shift - chip->page_shift);
-
+
/* Select the NAND device */
chip->select_chip(mtd, chipnr);
@@ -2748,7 +2748,7 @@ int nand_scan(struct mtd_info *mtd, int maxchips)
BUG();
}
#endif
-
+
ret = nand_scan_ident(mtd, maxchips);
if (!ret)
ret = nand_scan_tail(mtd);
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 78e70cc80..9fe486698 100644
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -128,7 +128,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
for (;
erase.addr < opts->offset + erase_length;
erase.addr += meminfo->erasesize) {
-
+
WATCHDOG_RESET ();
if (!opts->scrub && bbtest) {
@@ -163,7 +163,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
chip->ops.datbuf = NULL;
chip->ops.oobbuf = buf;
chip->ops.ooboffs = chip->badblockpos & ~0x01;
-
+
result = meminfo->write_oob(meminfo,
erase.addr + meminfo->oobsize,
&chip->ops);
@@ -254,7 +254,7 @@ static struct nand_ecclayout autoplace_ecclayout = {
* @chip: nand chip structure
* @oob: oob data buffer
* @ops: oob ops structure
- *
+ *
* Copied from nand_base.c
*/
static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
@@ -314,13 +314,13 @@ int nand_write_opts(nand_info_t *mtd, loff_t to, mtd_oob_ops_t *ops)
uint8_t *oob = ops->oobbuf;
uint8_t *buf = ops->datbuf;
int ret, subpage;
-
+
ops->retlen = 0;
if (!writelen)
return 0;
printk("nand_write_opts: to: 0x%08x, ops->len: 0x%08x\n", to, ops->len);
-
+
/* reject writes, which are not page aligned */
if (NOTALIGNED(to) || NOTALIGNED(ops->len)) {
printk(KERN_NOTICE "nand_write: "
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index db8bd7ba2..2984f5f28 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -421,7 +421,7 @@ struct nand_chip {
struct nand_ecc_ctrl ecc;
struct nand_buffers *buffers;
-
+
struct nand_hw_control hwcontrol;
struct mtd_oob_ops ops;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 04:22:45 +0000