Skip to contentSkip to conversation

C99 initializers for drivers/mtd/devices

PATCH In review Art Haas 2 participants 5 messages Apr 22, 2003 Memory technology devices (MTD)

lore
Share & tools
lore

Art Haas

author
#0 lore raw

PATCH 1/1 C99 initializers for drivers/mtd/devices

Hi.

Here are two trivial patches adding C99 initializers to the files. The patches are against the current BK.

Art Haas

===== drivers/mtd/devices/blkmtd.c 1.29 vs edited =====

drivers/mtd/devices/blkmtd.c +1 -4
@@ -287,12 +287,9 @@
   return 0;
 }
 
-                    
 static struct address_space_operations blkmtd_aops = {
-  writepage:     blkmtd_writepage,
-  readpage:      NULL,
+	.writepage	= blkmtd_writepage,
 }; 
-
 
 /* This is the kernel thread that empties the write queue to disk */
 static int write_queue_task(void *data)

===== drivers/mtd/devices/lart.c 1.1 vs edited =====

drivers/mtd/devices/lart.c +32 -37

78 lines not on this page · raw message

Signature · 4 lines
To announce that there must be no criticism of the President, or that we
are to stand by the President, right or wrong, is not only unpatriotic
and servile, but is morally treasonable to the American public.
 -- Theodore Roosevelt, Kansas City Star, 1918
#1 lore raw
Quoted 3 lines · Art Haas

Here are two trivial patches adding C99 initializers to the files. The patches are against the current BK.

IIRC, you sent four patches for mtd some time ago, but only two of those applied cleanly to the infradead cvs. The following thread ended quickly.

Anyway, David, Art, maybe you should discuss this one.

David, do you want to have patches against cvs and feed them to Linus the next round? Or would you prefer to pull the changes from Linus, so this should be applied as is?

Art, would you be willing to provide a patch against mtd cvs, in case David prefers that one? Use either cvs:
cvs -d :pserver:[email protected]:/home/cvs login (password: anoncvs) cvs -d :pserver:[email protected]:/home/cvs co mtd
or the dayly ftp snapshot:
ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/

Jörn

Signature · 2 lines
Victory in war is not repetitious.
-- Sun Tzu
author
#2 lore raw
Quoted 11 lines · J?rn Engel
Quoted 3 lines · Art Haas

Here are two trivial patches adding C99 initializers to the files. The patches are against the current BK.

Art, would you be willing to provide a patch against mtd cvs, in case David prefers that one? Use either cvs:
cvs -d :pserver:[email protected]:/home/cvs login (password: anoncvs) cvs -d :pserver:[email protected]:/home/cvs co mtd
or the dayly ftp snapshot:
ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/

I'm grabbing the cvs code now. Sorry I didn't follow up on the earlier threads - I should have grabbed the cvs code then.

Art Haas

Signature · 4 lines
To announce that there must be no criticism of the President, or that we
are to stand by the President, right or wrong, is not only unpatriotic
and servile, but is morally treasonable to the American public.
 -- Theodore Roosevelt, Kansas City Star, 1918
author
#3 lore raw
In reply to Jörn Engel

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

mtd/devices/lart.c +32 -37
diff -u -u -r1.2 lart.c
@@ -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
Signature · 4 lines
To announce that there must be no criticism of the President, or that we
are to stand by the President, right or wrong, is not only unpatriotic
and servile, but is morally treasonable to the American public.
 -- Theodore Roosevelt, Kansas City Star, 1918
#4 lore raw
Quoted 4 lines · Art Haas

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.

Committed, thanks!

Jörn

Signature · 3 lines
Fantasy is more important than knowlegde. Knowlegde is limited,
while fantasy embraces the whole world.
-- Albert Einstein