[MIPS] C99-ify struct resource initialization.

[linux-2.6-omap-h63xx.git] / arch / mips / ddb5xxx / ddb5476 / setup.c

diff --git a/arch/mips/ddb5xxx/ddb5476/setup.c b/arch/mips/ddb5xxx/ddb5476/setup.c
index f4e480a74edfc33c2f44b70e222fb9f028fa1db5..fc8d8bb4849c9391a49fe9129070a3989c6d2944 100644 (file)
--- a/arch/mips/ddb5xxx/ddb5476/setup.c
+++ b/arch/mips/ddb5xxx/ddb5476/setup.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
+#include <linux/pm.h>
 
 #include <asm/addrspace.h>
 #include <asm/bcache.h>
@@ -108,17 +109,42 @@ static struct {
        struct resource dma2;
 } ddb5476_ioport = {
        {
-       "dma1", 0x00, 0x1f, IORESOURCE_BUSY}, {
-       "timer", 0x40, 0x5f, IORESOURCE_BUSY}, {
-       "rtc", 0x70, 0x7f, IORESOURCE_BUSY}, {
-       "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, {
-       "dma2", 0xc0, 0xdf, IORESOURCE_BUSY}
+               .start  = 0x00,
+               .end    = 0x1f,
+               .name   = "dma1",
+               .flags  = IORESOURCE_BUSY
+       }, {
+               .start  = 0x40,
+               .end    = 0x5f,
+               .name   = "timer",
+               .flags  = IORESOURCE_BUSY
+       }, {
+               .start  = 0x70,
+               .end    = 0x7f,
+               .name   = "rtc",
+               .flags  = IORESOURCE_BUSY
+       }, {
+               .start  = 0x80,
+               .end    = 0x8f,
+               .name   = "dma page reg",
+               .flags  = IORESOURCE_BUSY
+       }, {
+               .start  = 0xc0,
+               .end    = 0xdf,
+               .name   = "dma2",
+               .flags  = IORESOURCE_BUSY
+       }
 };
 
 static struct {
        struct resource nile4;
 } ddb5476_iomem = {
-       { "Nile 4", DDB_BASE, DDB_BASE + DDB_SIZE - 1, IORESOURCE_BUSY}
+       {
+               .start  = DDB_BASE,
+               .end    = DDB_BASE + DDB_SIZE - 1,
+               .name   = "Nile 4",
+               .flags  = IORESOURCE_BUSY
+       }
 };
 
 
@@ -133,7 +159,7 @@ void __init plat_setup(void)
 
        _machine_restart = ddb_machine_restart;
        _machine_halt = ddb_machine_halt;
-       _machine_power_off = ddb_machine_power_off;
+       pm_power_off = ddb_machine_power_off;
 
        /* request io port/mem resources  */
        if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) ||