[MTD] bast-flash partitions fixup

Ensure the whole device is added if there are no partitions found on the
device, so that at least the flash can be read/written.

Replace some of the constants with their SZ_xxx counterparts

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ben Dooks 2005-01-18 11:13:50 +00:00 committed by Thomas Gleixner
parent 97f1a087dc
commit 6fc93d8ca7
1 changed files with 8 additions and 5 deletions

View File

@ -1,14 +1,15 @@
/* linux/drivers/mtd/maps/bast_flash.c /* linux/drivers/mtd/maps/bast_flash.c
* *
* Copyright (c) 2004 Simtec Electronics * Copyright (c) 2004-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
* Simtec Bast (EB2410ITX) NOR MTD Mapping driver * Simtec Bast (EB2410ITX) NOR MTD Mapping driver
* *
* Changelog: * Changelog:
* 20-Sep-2004 BJD Initial version * 20-Sep-2004 BJD Initial version
* 17-Jan-2005 BJD Add whole device if no partitions found
* *
* $Id: bast-flash.c,v 1.1 2004/09/21 14:29:04 bjd Exp $ * $Id: bast-flash.c,v 1.2 2005/01/18 11:13:47 bjd Exp $
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -46,9 +47,9 @@
#include <asm/arch/bast-cpld.h> #include <asm/arch/bast-cpld.h>
#ifdef CONFIG_MTD_BAST_MAXSIZE #ifdef CONFIG_MTD_BAST_MAXSIZE
#define AREA_MAXSIZE (CONFIG_MTD_BAST_MAXSIZE * (1024*1024)) #define AREA_MAXSIZE (CONFIG_MTD_BAST_MAXSIZE * SZ_1M)
#else #else
#define AREA_MAXSIZE (32*1024*1024) #define AREA_MAXSIZE (32 * SZ_1M)
#endif #endif
#define PFX "bast-flash: " #define PFX "bast-flash: "
@ -189,6 +190,8 @@ static int bast_flash_probe(struct device *dev)
err = add_mtd_partitions(info->mtd, info->partitions, err); err = add_mtd_partitions(info->mtd, info->partitions, err);
if (err) if (err)
printk(KERN_ERR PFX "cannot add/parse partitions\n"); printk(KERN_ERR PFX "cannot add/parse partitions\n");
} else {
err = add_mtd_device(info->mtd);
} }
if (err == 0) if (err == 0)