[PATCH] Amiga core C99

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga core: Use C99 struct initializers

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index dfb7b7cf348cb93a0f23021845a2074df64efaa9..b75901a31f82f86eb89e9397348476659e693fcc 100644 (file)
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -19,7 +19,9 @@
 
 unsigned long amiga_chip_size;
 
-static struct resource chipram_res = { "Chip RAM", CHIP_PHYSADDR };
+static struct resource chipram_res = {
+    .name = "Chip RAM", .start = CHIP_PHYSADDR
+};
 static unsigned long chipavail;
 
 

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 9ef027a6f1c401e7994002114ef7c78acba9b9e3..dbf8fbfd2773c14051608624e6e0749c581b934c 100644 (file)
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -121,14 +121,22 @@ static struct console amiga_console_driver = {
 static struct {
     struct resource _ciab, _ciaa, _custom, _kickstart;
 } mb_resources = {
-    ._ciab =           { "CIA B", 0x00bfd000, 0x00bfdfff },
-    ._ciaa =           { "CIA A", 0x00bfe000, 0x00bfefff },
-    ._custom =         { "Custom I/O", 0x00dff000, 0x00dfffff },
-    ._kickstart =      { "Kickstart ROM", 0x00f80000, 0x00ffffff }
+    ._ciab = {
+       .name = "CIA B", .start = 0x00bfd000, .end = 0x00bfdfff
+    },
+    ._ciaa = {
+       .name = "CIA A", .start = 0x00bfe000, .end = 0x00bfefff
+    },
+    ._custom = {
+       .name = "Custom I/O", .start = 0x00dff000, .end = 0x00dfffff
+    },
+    ._kickstart = {
+       .name = "Kickstart ROM", .start = 0x00f80000, .end = 0x00ffffff
+    }
 };
 
 static struct resource rtc_resource = {
-    NULL, 0x00dc0000, 0x00dcffff
+    .start = 0x00dc0000, .end = 0x00dcffff
 };
 
 static struct resource ram_resource[NUM_MEMINFO];
@@ -495,7 +503,7 @@ static void __init amiga_sched_init(irqreturn_t (*timer_routine)(int, void *,
                                                          struct pt_regs *))
 {
        static struct resource sched_res = {
-           "timer", 0x00bfd400, 0x00bfd5ff,
+           .name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,
        };
        jiffy_ticks = (amiga_eclock+HZ/2)/HZ;
 
@@ -798,7 +806,7 @@ static void amiga_mem_console_write(struct console *co, const char *s,
 
 static void amiga_savekmsg_init(void)
 {
-    static struct resource debug_res = { "Debug" };
+    static struct resource debug_res = { .name = "Debug" };
 
     savekmsg = amiga_chip_alloc_res(SAVEKMSG_MAXMEM, &debug_res);
     savekmsg->magic1 = SAVEKMSG_MAGIC1;