[PATCH] C99 initializers for drivers/mtd/chips

diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 52a81d8a1139647fabf0330273d844dee1ef35b7..83deb5ed90b8460fbb12214de1b484afda6af9e7 100644 (file)
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -120,10 +120,10 @@ static struct mtd_info *amd_flash_probe(struct map_info *map);
 
 
 static struct mtd_chip_driver amd_flash_chipdrv = {
-       probe: amd_flash_probe,
-       destroy: amd_flash_destroy,
-       name: "amd_flash",
-       module: THIS_MODULE
+       .probe          = amd_flash_probe,
+       .destroy        = amd_flash_destroy,
+       .name           = "amd_flash",
+       .module         = THIS_MODULE
 };
 
 
@@ -424,194 +424,194 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
         */
        const struct amd_flash_info table[] = {
        {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV160DT,
-               name: "AMD AM29LV160DT",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 31 },
-                       { offset: 0x1F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x1F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x1FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV160DT,
+               .name = "AMD AM29LV160DT",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
+                       { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV160DB,
-               name: "AMD AM29LV160DB",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 31 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV160DB,
+               .name = "AMD AM29LV160DB",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
                }
        }, {
-               mfr_id: MANUFACTURER_TOSHIBA,
-               dev_id: TC58FVT160,
-               name: "Toshiba TC58FVT160",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 31 },
-                       { offset: 0x1F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x1F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x1FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_TOSHIBA,
+               .dev_id = TC58FVT160,
+               .name = "Toshiba TC58FVT160",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
+                       { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_FUJITSU,
-               dev_id: MBM29LV160TE,
-               name: "Fujitsu MBM29LV160TE",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 31 },
-                       { offset: 0x1F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x1F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x1FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_FUJITSU,
+               .dev_id = MBM29LV160TE,
+               .name = "Fujitsu MBM29LV160TE",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
+                       { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_TOSHIBA,
-               dev_id: TC58FVB160,
-               name: "Toshiba TC58FVB160",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 31 }
+               .mfr_id = MANUFACTURER_TOSHIBA,
+               .dev_id = TC58FVB160,
+               .name = "Toshiba TC58FVB160",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
                }
        }, {
-               mfr_id: MANUFACTURER_FUJITSU,
-               dev_id: MBM29LV160BE,
-               name: "Fujitsu MBM29LV160BE",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 31 }
+               .mfr_id = MANUFACTURER_FUJITSU,
+               .dev_id = MBM29LV160BE,
+               .name = "Fujitsu MBM29LV160BE",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BB,
-               name: "AMD AM29LV800BB",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 15 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BB,
+               .name = "AMD AM29LV800BB",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29F800BB,
-               name: "AMD AM29F800BB",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 15 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29F800BB,
+               .name = "AMD AM29F800BB",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BT,
-               name: "AMD AM29LV800BT",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 15 },
-                       { offset: 0x0F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x0F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x0FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BT,
+               .name = "AMD AM29LV800BT",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
+                       { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29F800BT,
-               name: "AMD AM29F800BT",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 15 },
-                       { offset: 0x0F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x0F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x0FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29F800BT,
+               .name = "AMD AM29F800BT",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
+                       { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BB,
-               name: "AMD AM29LV800BB",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 15 },
-                       { offset: 0x0F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x0F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x0FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BB,
+               .name = "AMD AM29LV800BB",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
+                       { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W800T,
-               name: "ST M29W800T",
-               size: 0x00100000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 15 },
-                       { offset: 0x0F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x0F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x0FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W800T,
+               .name = "ST M29W800T",
+               .size = 0x00100000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
+                       { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W160DT,
-               name: "ST M29W160DT",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 31 },
-                       { offset: 0x1F0000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x1F8000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x1FC000, erasesize: 0x04000, numblocks:  1 }
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W160DT,
+               .name = "ST M29W160DT",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
+                       { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks  = 1 }
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W160DB,
-               name: "ST M29W160DB",
-               size: 0x00200000,
-               numeraseregions: 4,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x04000, numblocks:  1 },
-                       { offset: 0x004000, erasesize: 0x02000, numblocks:  2 },
-                       { offset: 0x008000, erasesize: 0x08000, numblocks:  1 },
-                       { offset: 0x010000, erasesize: 0x10000, numblocks: 31 }
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W160DB,
+               .name = "ST M29W160DB",
+               .size = 0x00200000,
+               .numeraseregions = 4,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x04000, .numblocks  = 1 },
+                       { .offset = 0x004000, .erasesize = 0x02000, .numblocks  = 2 },
+                       { .offset = 0x008000, .erasesize = 0x08000, .numblocks  = 1 },
+                       { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29BDS323D,
-               name: "AMD AM29BDS323D",
-               size: 0x00400000,
-               numeraseregions: 3,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 48 },
-                       { offset: 0x300000, erasesize: 0x10000, numblocks: 15 },
-                       { offset: 0x3f0000, erasesize: 0x02000, numblocks:  8 },
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29BDS323D,
+               .name = "AMD AM29BDS323D",
+               .size = 0x00400000,
+               .numeraseregions = 3,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 48 },
+                       { .offset = 0x300000, .erasesize = 0x10000, .numblocks = 15 },
+                       { .offset = 0x3f0000, .erasesize = 0x02000, .numblocks  = 8 },
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29BDS643D,
-               name: "AMD AM29BDS643D",
-               size: 0x00800000,
-               numeraseregions: 3,
-               regions: {
-                       { offset: 0x000000, erasesize: 0x10000, numblocks: 96 },
-                       { offset: 0x600000, erasesize: 0x10000, numblocks: 31 },
-                       { offset: 0x7f0000, erasesize: 0x02000, numblocks:  8 },
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29BDS643D,
+               .name = "AMD AM29BDS643D",
+               .size = 0x00800000,
+               .numeraseregions = 3,
+               .regions = {
+                       { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 96 },
+                       { .offset = 0x600000, .erasesize = 0x10000, .numblocks = 31 },
+                       { .offset = 0x7f0000, .erasesize = 0x02000, .numblocks  = 8 },
                }
        } 
        };

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 58dfc3527f94187ef07de5d78a5513d67e1ca7b3..5c6714cfea713c960169c06a43a098a727d36e39 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -47,10 +47,10 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *, int);
 static struct mtd_info *cfi_intelext_setup (struct map_info *);
 
 static struct mtd_chip_driver cfi_intelext_chipdrv = {
-       probe: NULL, /* Not usable directly */
-       destroy: cfi_intelext_destroy,
-       name: "cfi_cmdset_0001",
-       module: THIS_MODULE
+       .probe          = NULL, /* Not usable directly */
+       .destroy        = cfi_intelext_destroy,
+       .name           = "cfi_cmdset_0001",
+       .module         = THIS_MODULE
 };
 
 /* #define DEBUG_LOCK_BITS */

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 5e4f3fe72cd26951185c182b7329cc8285916635..a7cf7493a23f5f4b5f184f9ac960ac1e3497138e 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -43,10 +43,10 @@ static struct mtd_info *cfi_amdstd_setup (struct map_info *);
 
 
 static struct mtd_chip_driver cfi_amdstd_chipdrv = {
-       probe: NULL, /* Not usable directly */
-       destroy: cfi_amdstd_destroy,
-       name: "cfi_cmdset_0002",
-       module: THIS_MODULE
+       .probe          = NULL, /* Not usable directly */
+       .destroy        = cfi_amdstd_destroy,
+       .name           = "cfi_cmdset_0002",
+       .module         = THIS_MODULE
 };
 
 struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)

diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index f54d362a501f9c03e8813dfb1554d258514b25b8..0471edd27ed91a07bba020c5a2f00eb4e411053d 100644 (file)
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -294,8 +294,8 @@ static void print_cfi_ident(struct cfi_ident *cfip)
 #endif /* DEBUG_CFI */
 
 static struct chip_probe cfi_chip_probe = {
-       name: "CFI",
-       probe_chip: cfi_probe_chip
+       .name           = "CFI",
+       .probe_chip     = cfi_probe_chip
 };
 
 struct mtd_info *cfi_probe(struct map_info *map)
@@ -308,9 +308,9 @@ struct mtd_info *cfi_probe(struct map_info *map)
 }
 
 static struct mtd_chip_driver cfi_chipdrv = {
-       probe: cfi_probe,
-       name: "cfi_probe",
-       module: THIS_MODULE
+       .probe          = cfi_probe,
+       .name           = "cfi_probe",
+       .module         = THIS_MODULE
 };
 
 int __init cfi_probe_init(void)

diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
index 507b7e513c17ef2d41e5d0a93d83e621ec477820..862bc4bb4c84dc07c3c3c4d6c4858a90ef5ab460 100644 (file)
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
@@ -33,14 +33,51 @@ static unsigned long my_bank_size;
 
 /* Listing of parts and sizes. We need this table to learn the sector
    size of the chip and the total length */
-static const struct JEDECTable JEDEC_table[] = 
-  {{0x013D,"AMD Am29F017D",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
-   {0x01AD,"AMD Am29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
-   {0x01D5,"AMD Am29F080",1*1024*1024,64*1024,MTD_CAP_NORFLASH},
-   {0x01A4,"AMD Am29F040",512*1024,64*1024,MTD_CAP_NORFLASH},
-   {0x20E3,"AMD Am29W040B",512*1024,64*1024,MTD_CAP_NORFLASH},
-   {0xC2AD,"Macronix MX29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH},
-   {}};
+static const struct JEDECTable JEDEC_table[] = {
+       {
+               .jedec          = 0x013D,
+               .name           = "AMD Am29F017D",
+               .size           = 2*1024*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       {
+               .jedec          = 0x01AD,
+               .name           = "AMD Am29F016",
+               .size           = 2*1024*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       {
+               .jedec          = 0x01D5,
+               .name           = "AMD Am29F080",
+               .size           = 1*1024*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       {
+               .jedec          = 0x01A4,
+               .name           = "AMD Am29F040",
+               .size           = 512*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       {
+               .jedec          = 0x20E3,
+               .name           = "AMD Am29W040B",
+               .size           = 512*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       {
+               .jedec          = 0xC2AD,
+               .name           = "Macronix MX29F016",
+               .size           = 2*1024*1024,
+               .sectorsize     = 64*1024,
+               .capabilities   = MTD_CAP_NORFLASH
+       },
+       { .jedec = 0x0 }
+};
 
 static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id);
 static void jedec_sync(struct mtd_info *mtd) {};
@@ -54,9 +91,9 @@ static struct mtd_info *jedec_probe(struct map_info *map);
 
 
 static struct mtd_chip_driver jedec_chipdrv = {
-       probe: jedec_probe,
-       name: "jedec",
-       module: THIS_MODULE
+       .probe  = jedec_probe,
+       .name   = "jedec",
+       .module = THIS_MODULE
 };
 
 /* Probe entry point */

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 64fac448e2f7142d9ca8d9f632c90260d622ce2d..f1e47a69bec935cdfb15e9f58331fb82f96b8559 100644 (file)
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -75,176 +75,176 @@ struct amd_flash_info {
 
 static const struct amd_flash_info jedec_table[] = {
        {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV160DT,
-               name: "AMD AM29LV160DT",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,31),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV160DT,
+               .name = "AMD AM29LV160DT",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,31),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV160DB,
-               name: "AMD AM29LV160DB",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV160DB,
+               .name = "AMD AM29LV160DB",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,31)
                }
        }, {
-               mfr_id: MANUFACTURER_TOSHIBA,
-               dev_id: TC58FVT160,
-               name: "Toshiba TC58FVT160",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,31),
+               .mfr_id = MANUFACTURER_TOSHIBA,
+               .dev_id = TC58FVT160,
+               .name = "Toshiba TC58FVT160",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,31),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_FUJITSU,
-               dev_id: MBM29LV160TE,
-               name: "Fujitsu MBM29LV160TE",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,31),
+               .mfr_id = MANUFACTURER_FUJITSU,
+               .dev_id = MBM29LV160TE,
+               .name = "Fujitsu MBM29LV160TE",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,31),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_TOSHIBA,
-               dev_id: TC58FVB160,
-               name: "Toshiba TC58FVB160",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_TOSHIBA,
+               .dev_id = TC58FVB160,
+               .name = "Toshiba TC58FVB160",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,31)
                }
        }, {
-               mfr_id: MANUFACTURER_FUJITSU,
-               dev_id: MBM29LV160BE,
-               name: "Fujitsu MBM29LV160BE",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_FUJITSU,
+               .dev_id = MBM29LV160BE,
+               .name = "Fujitsu MBM29LV160BE",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,31)
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BB,
-               name: "AMD AM29LV800BB",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BB,
+               .name = "AMD AM29LV800BB",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,15),
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29F800BB,
-               name: "AMD AM29F800BB",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29F800BB,
+               .name = "AMD AM29F800BB",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,15),
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BT,
-               name: "AMD AM29LV800BT",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,15),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BT,
+               .name = "AMD AM29LV800BT",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,15),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29F800BT,
-               name: "AMD AM29F800BT",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,15),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29F800BT,
+               .name = "AMD AM29F800BT",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,15),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29LV800BB,
-               name: "AMD AM29LV800BB",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,15),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29LV800BB,
+               .name = "AMD AM29LV800BB",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,15),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W800T,
-               name: "ST M29W800T",
-               DevSize: SIZE_1MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,15),
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W800T,
+               .name = "ST M29W800T",
+               .DevSize = SIZE_1MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,15),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W160DT,
-               name: "ST M29W160DT",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,31),
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W160DT,
+               .name = "ST M29W160DT",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,31),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_ST,
-               dev_id: M29W160DB,
-               name: "ST M29W160DB",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x04000,1),
+               .mfr_id = MANUFACTURER_ST,
+               .dev_id = M29W160DB,
+               .name = "ST M29W160DB",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x04000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x10000,31)
                }
        }, {
-               mfr_id: MANUFACTURER_ATMEL,
-               dev_id: AT49BV16X4,
-               name: "Atmel AT49BV16X4",
-               DevSize: SIZE_2MiB,
-               NumEraseRegions: 3,
-               regions: {ERASEINFO(0x02000,8),
+               .mfr_id = MANUFACTURER_ATMEL,
+               .dev_id = AT49BV16X4,
+               .name = "Atmel AT49BV16X4",
+               .DevSize = SIZE_2MiB,
+               .NumEraseRegions = 3,
+               .regions = {ERASEINFO(0x02000,8),
                          ERASEINFO(0x08000,2),
                          ERASEINFO(0x10000,30)
                }
        }, {
-                mfr_id: MANUFACTURER_ATMEL,
-                dev_id: AT49BV16X4T,
-                name: "Atmel AT49BV16X4T",
-                DevSize: SIZE_2MiB,
-                NumEraseRegions: 3,
-                regions: {ERASEINFO(0x10000,30),
+                .mfr_id = MANUFACTURER_ATMEL,
+                .dev_id = AT49BV16X4T,
+                .name = "Atmel AT49BV16X4T",
+                .DevSize = SIZE_2MiB,
+                .NumEraseRegions = 3,
+                .regions = {ERASEINFO(0x10000,30),
                           ERASEINFO(0x08000,2),
                          ERASEINFO(0x02000,8)
                 }
@@ -403,8 +403,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
 }
 
 static struct chip_probe jedec_chip_probe = {
-       name: "JEDEC",
-       probe_chip: jedec_probe_chip
+       .name = "JEDEC",
+       .probe_chip = jedec_probe_chip
 };
 
 struct mtd_info *jedec_probe(struct map_info *map)
@@ -417,9 +417,9 @@ struct mtd_info *jedec_probe(struct map_info *map)
 }
 
 static struct mtd_chip_driver jedec_chipdrv = {
-       probe: jedec_probe,
-       name: "jedec_probe",
-       module: THIS_MODULE
+       .probe  = jedec_probe,
+       .name   = "jedec_probe",
+       .module = THIS_MODULE
 };
 
 int __init jedec_probe_init(void)

diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index 9478d0e7920c896481c3ab799fab47ef073e3f4a..1c884572e2cc25dc76bed363e3b54fb19c317f33 100644 (file)
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -36,10 +36,10 @@ static void map_absent_destroy (struct mtd_info *);
 
 
 static struct mtd_chip_driver map_absent_chipdrv = {
-       probe:          map_absent_probe,
-       destroy:        map_absent_destroy,
-       name:           "map_absent",
-       module:         THIS_MODULE
+       .probe          = map_absent_probe,
+       .destroy        = map_absent_destroy,
+       .name           = "map_absent",
+       .module         = THIS_MODULE
 };
 
 static struct mtd_info *map_absent_probe(struct map_info *map)

diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index 287a25555b4f5f56a47fc572c10850f2a3911c2e..872ee9e280fdb70ea2a51c1a1df76a3dae56bb44 100644 (file)
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -23,9 +23,9 @@ static struct mtd_info *map_ram_probe(struct map_info *map);
 
 
 static struct mtd_chip_driver mapram_chipdrv = {
-       probe: map_ram_probe,
-       name: "map_ram",
-       module: THIS_MODULE
+       .probe  = map_ram_probe,
+       .name   = "map_ram",
+       .module = THIS_MODULE
 };
 
 static struct mtd_info *map_ram_probe(struct map_info *map)

diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index d077bacf1580bcf974a2461267461c962f0e09ee..6d7f5146c97e319484758eba44b4162a3d1dff2b 100644 (file)
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -21,9 +21,9 @@ static void maprom_nop (struct mtd_info *);
 struct mtd_info *map_rom_probe(struct map_info *map);
 
 static struct mtd_chip_driver maprom_chipdrv = {
-       probe: map_rom_probe,
-       name: "map_rom",
-       module: THIS_MODULE
+       .probe  = map_rom_probe,
+       .name   = "map_rom",
+       .module = THIS_MODULE
 };
 
 struct mtd_info *map_rom_probe(struct map_info *map)

diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
index 85df53b919f93e977606b5c6c9db65b5b468a4d1..df650c1dbc88c90f6479e3b5303d314a2271f2d7 100644 (file)
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
@@ -98,10 +98,10 @@ struct mtd_info *sharp_probe(struct map_info *map);
 static void sharp_destroy(struct mtd_info *mtd);
 
 static struct mtd_chip_driver sharp_chipdrv = {
-       probe: sharp_probe,
-       destroy: sharp_destroy,
-       name: "sharp",
-       module: THIS_MODULE
+       .probe          = sharp_probe,
+       .destroy        = sharp_destroy,
+       .name           = "sharp",
+       .module         = THIS_MODULE
 };