X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmtd%2Fdevices%2Flart.c;fp=drivers%2Fmtd%2Fdevices%2Flart.c;h=1e876fcb04084ca43ff366803973fad01ee9b833;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=4ea50a1dda8570a1606abbbd623c93f011df2bb7;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index 4ea50a1dd..1e876fcb0 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -581,6 +581,8 @@ static int flash_write (struct mtd_info *mtd,loff_t to,size_t len,size_t *retlen
 
 /***************************************************************************************************/
 
+#define NB_OF(x) (sizeof (x) / sizeof (x[0]))
+
 static struct mtd_info mtd;
 
 static struct mtd_erase_region_info erase_regions[] = {
@@ -635,11 +637,10 @@ int __init lart_flash_init (void)
    printk ("%s: This looks like a LART board to me.\n",module_name);
    mtd.name = module_name;
    mtd.type = MTD_NORFLASH;
-   mtd.writesize = 1;
    mtd.flags = MTD_CAP_NORFLASH;
    mtd.size = FLASH_BLOCKSIZE_PARAM * FLASH_NUMBLOCKS_16m_PARAM + FLASH_BLOCKSIZE_MAIN * FLASH_NUMBLOCKS_16m_MAIN;
    mtd.erasesize = FLASH_BLOCKSIZE_MAIN;
-   mtd.numeraseregions = ARRAY_SIZE(erase_regions);
+   mtd.numeraseregions = NB_OF (erase_regions);
    mtd.eraseregions = erase_regions;
    mtd.erase = flash_erase;
    mtd.read = flash_read;
@@ -669,9 +670,9 @@ int __init lart_flash_init (void)
 			   result,mtd.eraseregions[result].numblocks);
 
 #ifdef HAVE_PARTITIONS
-   printk ("\npartitions = %d\n", ARRAY_SIZE(lart_partitions));
+   printk ("\npartitions = %d\n",NB_OF (lart_partitions));
 
-   for (result = 0; result < ARRAY_SIZE(lart_partitions); result++)
+   for (result = 0; result < NB_OF (lart_partitions); result++)
 	 printk (KERN_DEBUG
 			 "\n\n"
 			 "lart_partitions[%d].name = %s\n"
@@ -686,7 +687,7 @@ int __init lart_flash_init (void)
 #ifndef HAVE_PARTITIONS
    result = add_mtd_device (&mtd);
 #else
-   result = add_mtd_partitions (&mtd,lart_partitions, ARRAY_SIZE(lart_partitions));
+   result = add_mtd_partitions (&mtd,lart_partitions,NB_OF (lart_partitions));
 #endif
 
    return (result);