Re: [PATCH] C99 initializers for drivers/mtd/devices

Art Haas
2003-04-22T19:25:26Z

Here's a patch against the CVS lart.c to convert it to C99. The
'blkmtd.c' file from CVS doesn't match the file I generated the C99
patch for that was in the kernel.

Art Haas

Index: drivers/mtd/devices/lart.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/lart.c,v
retrieving revision 1.2
diff -u -u -r1.2 lart.c
--- drivers/mtd/devices/lart.c 2 Oct 2001 15:05:13 -0000 1.2
+++ drivers/mtd/devices/lart.c 22 Apr 2003 19:23:43 -0000
@@ -584,46 +584,41 @@

static struct mtd_info mtd;

-static struct mtd_erase_region_info erase_regions[] =
-{
- /* parameter blocks */
- {
- offset: 0x00000000,
- erasesize: FLASH_BLOCKSIZE_PARAM,
- numblocks: FLASH_NUMBLOCKS_16m_PARAM
- },
- /* main blocks */
- {
- offset: FLASH_BLOCKSIZE_PARAM * FLASH_NUMBLOCKS_16m_PARAM,
- erasesize: FLASH_BLOCKSIZE_MAIN,
- numblocks: FLASH_NUMBLOCKS_16m_MAIN
- }
+static struct mtd_erase_region_info erase_regions[] = {
+ /* parameter blocks */
+ {
+ .offset = 0x00000000,
+ .erasesize = FLASH_BLOCKSIZE_PARAM,
+ .numblocks = FLASH_NUMBLOCKS_16m_PARAM,
+ },
+ /* main blocks */
+ {
+ .offset = FLASH_BLOCKSIZE_PARAM * FLASH_NUMBLOCKS_16m_PARAM,
+ .erasesize = FLASH_BLOCKSIZE_MAIN,
+ .numblocks = FLASH_NUMBLOCKS_16m_MAIN,
+ }
};

#ifdef HAVE_PARTITIONS
-static struct mtd_partition lart_partitions[] =
-{
- /* blob */
- {
- name: "blob",
- offset: BLOB_START,
- size: BLOB_LEN,
- mask_flags: 0
- },
- /* kernel */
- {
- name: "kernel",
- offset: KERNEL_START, /* MTDPART_OFS_APPEND */
- size: KERNEL_LEN,
- mask_flags: 0
- },
- /* initial ramdisk / file system */
- {
- name: "file system",
- offset: INITRD_START, /* MTDPART_OFS_APPEND */
- size: INITRD_LEN, /* MTDPART_SIZ_FULL */
- mask_flags: 0
- }
+static struct mtd_partition lart_partitions[] = {
+ /* blob */
+ {
+ .name = "blob",
+ .offset = BLOB_START,
+ .size = BLOB_LEN,
+ },
+ /* kernel */
+ {
+ .name = "kernel",
+ .offset = KERNEL_START, /* MTDPART_OFS_APPEND */
+ .size = KERNEL_LEN,
+ },
+ /* initial ramdisk / file system */
+ {
+ .name = "file system",
+ .offset = INITRD_START, /* MTDPART_OFS_APPEND */
+ .size = INITRD_LEN, /* MTDPART_SIZ_FULL */
+ }
};
#endif