Skip to content

Commit

Permalink
[MTD] Remove trailing whitespace
Browse files Browse the repository at this point in the history
The newly-added cafe_ecc.c had a lot of it because of the way the lookup
table was auto-generated; clean up the other files too while we're at it.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
David Woodhouse committed Nov 30, 2006
1 parent dd36f26 commit c9ac597
Show file tree
Hide file tree
Showing 9 changed files with 539 additions and 540 deletions.
2 changes: 1 addition & 1 deletion drivers/mtd/chips/gen_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
if (mtd) {
if (mtd->size > map->size) {
printk(KERN_WARNING "Reducing visibility of %ldKiB chip to %ldKiB\n",
(unsigned long)mtd->size >> 10,
(unsigned long)mtd->size >> 10,
(unsigned long)map->size >> 10);
mtd->size = map->size;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/bast-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int bast_flash_probe(struct platform_device *pdev)

info->map.phys = res->start;
info->map.size = res->end - res->start + 1;
info->map.name = pdev->dev.bus_id;
info->map.name = pdev->dev.bus_id;
info->map.bankwidth = 2;

if (info->map.size > AREA_MAXSIZE)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/ck804xrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define ADDRESS_NAME_LEN 18

#define ROM_PROBE_STEP_SIZE (64*1024)
#define ROM_PROBE_STEP_SIZE (64*1024)

struct ck804xrom_window {
void __iomem *virt;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/nettel.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ int __init nettel_init(void)
iounmap(nettel_amd_map.virt);

return(rc);

}

/****************************************************************************/
Expand Down
17 changes: 8 additions & 9 deletions drivers/mtd/nand/cafe.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01
*
* Copyright © 2006 Red Hat, Inc.
Expand Down Expand Up @@ -60,7 +60,6 @@ struct cafe_priv {
int page_addr;
dma_addr_t dmaaddr;
unsigned char *dmabuf;

};

static int usedma = 1;
Expand Down Expand Up @@ -217,7 +216,7 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
ctl1 |= ((adrbytes-1)|8) << 27;

if (command == NAND_CMD_SEQIN || command == NAND_CMD_ERASE1) {
/* Ignore the first command of a pair; the hardware
/* Ignore the first command of a pair; the hardware
deals with them both at once, later */
cafe->ctl1 = ctl1;
cafe_dev_dbg(&cafe->pdev->dev, "Setup for delayed command, ctl1 %08x, dlen %x\n",
Expand All @@ -231,7 +230,7 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
cafe_writel(cafe, cafe->ctl2 | 0x100 | NAND_CMD_READSTART, NAND_CTRL2);

do_command:
cafe_dev_dbg(&cafe->pdev->dev, "dlen %x, ctl1 %x, ctl2 %x\n",
cafe_dev_dbg(&cafe->pdev->dev, "dlen %x, ctl1 %x, ctl2 %x\n",
cafe->datalen, ctl1, cafe_readl(cafe, NAND_CTRL2));

/* NB: The datasheet lies -- we really should be subtracting 1 here */
Expand Down Expand Up @@ -380,7 +379,7 @@ static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
uint32_t tmp = cafe_readl(cafe, NAND_ECC_SYN01 + (i*2));
syn[i] = tmp & 0xfff;
syn[i+1] = (tmp >> 16) & 0xfff;
}
}

if ((i = cafe_correct_ecc(buf, syn)) < 0) {
dev_dbg(&cafe->pdev->dev, "Failed to correct ECC at %08x\n",
Expand All @@ -404,7 +403,7 @@ static struct nand_ecclayout cafe_oobinfo_2048 = {
.oobfree = {{14, 50}}
};

/* Ick. The BBT code really ought to be able to work this bit out
/* Ick. The BBT code really ought to be able to work this bit out
for itself from the above, at least for the 2KiB case */
static uint8_t cafe_bbt_pattern_2048[] = { 'B', 'b', 't', '0' };
static uint8_t cafe_mirror_pattern_2048[] = { '1', 't', 'b', 'B' };
Expand Down Expand Up @@ -579,7 +578,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
cafe->nand.options |= NAND_SKIP_BBTSCAN;
cafe->nand.block_bad = cafe_nand_block_bad;
}

/* Start off by resetting the NAND controller completely */
cafe_writel(cafe, 1, NAND_RESET);
cafe_writel(cafe, 0, NAND_RESET);
Expand All @@ -600,7 +599,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd);
if (err) {
dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);

goto out_free_dma;
}
#if 1
Expand Down Expand Up @@ -654,7 +653,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
writel(0x84600070, cafe->mmio);
udelay(10);
cafe_dev_dbg(&cafe->pdev->dev, "Status %x\n", cafe_readl(cafe, NAND_NONMEM));
#endif
#endif
/* Scan to find existance of the device */
if (nand_scan_ident(mtd, 1)) {
err = -ENXIO;
Expand Down
1,046 changes: 523 additions & 523 deletions drivers/mtd/nand/cafe_ecc.c

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions drivers/mtd/nand/cs553x_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* published by the Free Software Foundation.
*
* Overview:
* This is a device driver for the NAND flash controller found on
* This is a device driver for the NAND flash controller found on
* the AMD CS5535/CS5536 companion chipsets for the Geode processor.
*
*/
Expand Down Expand Up @@ -303,7 +303,7 @@ static int __init cs553x_init(void)
err = cs553x_init_one(i, !!(val & FLSH_MEM_IO), val & 0xFFFFFFFF);
}

/* Register all devices together here. This means we can easily hack it to
/* Register all devices together here. This means we can easily hack it to
do mtdconcat etc. if we want to. */
for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
if (cs553x_mtd[i]) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
unsigned int ctrl)
{
struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);

if (cmd == NAND_CMD_NONE)
return;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/onenand/onenand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ static int onenand_try_interrupt_wait(struct mtd_info *mtd, int state)

/* Release the irq */
free_irq(this->irq, this);

this->wait = onenand_wait;
}

Expand Down

0 comments on commit c9ac597

Please sign in to comment.