[PATCH 4/10] 2.6.0-t3: struct C99 initialiser conversion

CaT
2003-08-19T06:38:10Z

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]

linux/arch/sh patch

--
"How can I not love the Americans? They helped me with a flat tire the
other day," he said.
- http://tinyurl.com/h6fo

[-- Attachment #2: 2.6.0-t3.c99.arch.sh.patch --]
[-- Type: text/plain, Size: 44882 bytes --]

diff -aur linux.backup/arch/sh/boards/adx/mach.c linux/arch/sh/boards/adx/mach.c
--- linux.backup/arch/sh/boards/adx/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/adx/mach.c Sat Aug 16 15:45:00 2003
@@ -24,41 +24,41 @@
*/

struct sh_machine_vector mv_adx __initmv = {
- mv_nr_irqs: 48,
+ .mv_nr_irqs = 48,

- mv_inb: adx_inb,
- mv_inw: adx_inw,
- mv_inl: adx_inl,
- mv_outb: adx_outb,
- mv_outw: adx_outw,
- mv_outl: adx_outl,
-
- mv_inb_p: adx_inb_p,
- mv_inw_p: adx_inw,
- mv_inl_p: adx_inl,
- mv_outb_p: adx_outb_p,
- mv_outw_p: adx_outw,
- mv_outl_p: adx_outl,
-
- mv_insb: adx_insb,
- mv_insw: adx_insw,
- mv_insl: adx_insl,
- mv_outsb: adx_outsb,
- mv_outsw: adx_outsw,
- mv_outsl: adx_outsl,
-
- mv_readb: adx_readb,
- mv_readw: adx_readw,
- mv_readl: adx_readl,
- mv_writeb: adx_writeb,
- mv_writew: adx_writew,
- mv_writel: adx_writel,
+ .mv_inb = adx_inb,
+ .mv_inw = adx_inw,
+ .mv_inl = adx_inl,
+ .mv_outb = adx_outb,
+ .mv_outw = adx_outw,
+ .mv_outl = adx_outl,
+
+ .mv_inb_p = adx_inb_p,
+ .mv_inw_p = adx_inw,
+ .mv_inl_p = adx_inl,
+ .mv_outb_p = adx_outb_p,
+ .mv_outw_p = adx_outw,
+ .mv_outl_p = adx_outl,
+
+ .mv_insb = adx_insb,
+ .mv_insw = adx_insw,
+ .mv_insl = adx_insl,
+ .mv_outsb = adx_outsb,
+ .mv_outsw = adx_outsw,
+ .mv_outsl = adx_outsl,
+
+ .mv_readb = adx_readb,
+ .mv_readw = adx_readw,
+ .mv_readl = adx_readl,
+ .mv_writeb = adx_writeb,
+ .mv_writew = adx_writew,
+ .mv_writel = adx_writel,

- mv_ioremap: adx_ioremap,
- mv_iounmap: adx_iounmap,
+ .mv_ioremap = adx_ioremap,
+ .mv_iounmap = adx_iounmap,

- mv_isa_port2addr: adx_isa_port2addr,
+ .mv_isa_port2addr = adx_isa_port2addr,

- mv_init_irq: init_adx_IRQ,
+ .mv_init_irq = init_adx_IRQ,
};
ALIAS_MV(adx)
diff -aur linux.backup/arch/sh/boards/bigsur/mach.c linux/arch/sh/boards/bigsur/mach.c
--- linux.backup/arch/sh/boards/bigsur/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/bigsur/mach.c Sat Aug 16 18:11:31 2003
@@ -28,44 +28,44 @@
extern void init_bigsur_IRQ(void);

struct sh_machine_vector mv_bigsur __initmv = {
- mv_nr_irqs: NR_IRQS, // Defined in <asm/irq.h>
- mv_inb: bigsur_inb,
- mv_inw: bigsur_inw,
- mv_inl: bigsur_inl,
- mv_outb: bigsur_outb,
- mv_outw: bigsur_outw,
- mv_outl: bigsur_outl,
-
- mv_inb_p: bigsur_inb_p,
- mv_inw_p: bigsur_inw,
- mv_inl_p: bigsur_inl,
- mv_outb_p: bigsur_outb_p,
- mv_outw_p: bigsur_outw,
- mv_outl_p: bigsur_outl,
-
- mv_insb: bigsur_insb,
- mv_insw: bigsur_insw,
- mv_insl: bigsur_insl,
- mv_outsb: bigsur_outsb,
- mv_outsw: bigsur_outsw,
- mv_outsl: bigsur_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_nr_irqs = NR_IRQS, // Defined in <asm/irq.h>
+ .mv_inb = bigsur_inb,
+ .mv_inw = bigsur_inw,
+ .mv_inl = bigsur_inl,
+ .mv_outb = bigsur_outb,
+ .mv_outw = bigsur_outw,
+ .mv_outl = bigsur_outl,
+
+ .mv_inb_p = bigsur_inb_p,
+ .mv_inw_p = bigsur_inw,
+ .mv_inl_p = bigsur_inl,
+ .mv_outb_p = bigsur_outb_p,
+ .mv_outw_p = bigsur_outw,
+ .mv_outl_p = bigsur_outl,
+
+ .mv_insb = bigsur_insb,
+ .mv_insw = bigsur_insw,
+ .mv_insl = bigsur_insl,
+ .mv_outsb = bigsur_outsb,
+ .mv_outsw = bigsur_outsw,
+ .mv_outsl = bigsur_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: bigsur_isa_port2addr,
- mv_irq_demux: bigsur_irq_demux,
+ .mv_isa_port2addr = bigsur_isa_port2addr,
+ .mv_irq_demux = bigsur_irq_demux,

- mv_init_irq: init_bigsur_IRQ,
+ .mv_init_irq = init_bigsur_IRQ,
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_bigsur,
+ .mv_heartbeat = heartbeat_bigsur,
#endif

};
diff -aur linux.backup/arch/sh/boards/cat68701/mach.c linux/arch/sh/boards/cat68701/mach.c
--- linux.backup/arch/sh/boards/cat68701/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/cat68701/mach.c Sat Aug 16 15:45:00 2003
@@ -23,44 +23,44 @@
*/

struct sh_machine_vector mv_cat68701 __initmv = {
- mv_nr_irqs: 32,
- mv_inb: cat68701_inb,
- mv_inw: cat68701_inw,
- mv_inl: cat68701_inl,
- mv_outb: cat68701_outb,
- mv_outw: cat68701_outw,
- mv_outl: cat68701_outl,
-
- mv_inb_p: cat68701_inb_p,
- mv_inw_p: cat68701_inw,
- mv_inl_p: cat68701_inl,
- mv_outb_p: cat68701_outb_p,
- mv_outw_p: cat68701_outw,
- mv_outl_p: cat68701_outl,
-
- mv_insb: cat68701_insb,
- mv_insw: cat68701_insw,
- mv_insl: cat68701_insl,
- mv_outsb: cat68701_outsb,
- mv_outsw: cat68701_outsw,
- mv_outsl: cat68701_outsl,
-
- mv_readb: cat68701_readb,
- mv_readw: cat68701_readw,
- mv_readl: cat68701_readl,
- mv_writeb: cat68701_writeb,
- mv_writew: cat68701_writew,
- mv_writel: cat68701_writel,
+ .mv_nr_irqs = 32,
+ .mv_inb = cat68701_inb,
+ .mv_inw = cat68701_inw,
+ .mv_inl = cat68701_inl,
+ .mv_outb = cat68701_outb,
+ .mv_outw = cat68701_outw,
+ .mv_outl = cat68701_outl,
+
+ .mv_inb_p = cat68701_inb_p,
+ .mv_inw_p = cat68701_inw,
+ .mv_inl_p = cat68701_inl,
+ .mv_outb_p = cat68701_outb_p,
+ .mv_outw_p = cat68701_outw,
+ .mv_outl_p = cat68701_outl,
+
+ .mv_insb = cat68701_insb,
+ .mv_insw = cat68701_insw,
+ .mv_insl = cat68701_insl,
+ .mv_outsb = cat68701_outsb,
+ .mv_outsw = cat68701_outsw,
+ .mv_outsl = cat68701_outsl,
+
+ .mv_readb = cat68701_readb,
+ .mv_readw = cat68701_readw,
+ .mv_readl = cat68701_readl,
+ .mv_writeb = cat68701_writeb,
+ .mv_writew = cat68701_writew,
+ .mv_writel = cat68701_writel,

- mv_ioremap: cat68701_ioremap,
- mv_iounmap: cat68701_iounmap,
+ .mv_ioremap = cat68701_ioremap,
+ .mv_iounmap = cat68701_iounmap,

- mv_isa_port2addr: cat68701_isa_port2addr,
- mv_irq_demux: cat68701_irq_demux,
+ .mv_isa_port2addr = cat68701_isa_port2addr,
+ .mv_irq_demux = cat68701_irq_demux,

- mv_init_irq: init_cat68701_IRQ,
+ .mv_init_irq = init_cat68701_IRQ,
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_cat68701,
+ .mv_heartbeat = heartbeat_cat68701,
#endif
};
ALIAS_MV(cat68701)
diff -aur linux.backup/arch/sh/boards/cqreek/mach.c linux/arch/sh/boards/cqreek/mach.c
--- linux.backup/arch/sh/boards/cqreek/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/cqreek/mach.c Sat Aug 16 15:45:00 2003
@@ -21,46 +21,46 @@

struct sh_machine_vector mv_cqreek __initmv = {
#if defined(CONFIG_CPU_SH4)
- mv_nr_irqs: 48,
+ .mv_nr_irqs = 48,
#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
- mv_nr_irqs: 32,
+ .mv_nr_irqs = 32,
#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
- mv_nr_irqs: 61,
+ .mv_nr_irqs = 61,
#endif

- mv_inb: generic_inb,
- mv_inw: generic_inw,
- mv_inl: generic_inl,
- mv_outb: generic_outb,
- mv_outw: generic_outw,
- mv_outl: generic_outl,
-
- mv_inb_p: generic_inb_p,
- mv_inw_p: generic_inw_p,
- mv_inl_p: generic_inl_p,
- mv_outb_p: generic_outb_p,
- mv_outw_p: generic_outw_p,
- mv_outl_p: generic_outl_p,
-
- mv_insb: generic_insb,
- mv_insw: generic_insw,
- mv_insl: generic_insl,
- mv_outsb: generic_outsb,
- mv_outsw: generic_outsw,
- mv_outsl: generic_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = generic_inb,
+ .mv_inw = generic_inw,
+ .mv_inl = generic_inl,
+ .mv_outb = generic_outb,
+ .mv_outw = generic_outw,
+ .mv_outl = generic_outl,
+
+ .mv_inb_p = generic_inb_p,
+ .mv_inw_p = generic_inw_p,
+ .mv_inl_p = generic_inl_p,
+ .mv_outb_p = generic_outb_p,
+ .mv_outw_p = generic_outw_p,
+ .mv_outl_p = generic_outl_p,
+
+ .mv_insb = generic_insb,
+ .mv_insw = generic_insw,
+ .mv_insl = generic_insl,
+ .mv_outsb = generic_outsb,
+ .mv_outsw = generic_outsw,
+ .mv_outsl = generic_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_init_irq: init_cqreek_IRQ,
+ .mv_init_irq = init_cqreek_IRQ,

- mv_isa_port2addr: cqreek_port2addr,
+ .mv_isa_port2addr = cqreek_port2addr,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,
};
ALIAS_MV(cqreek)
diff -aur linux.backup/arch/sh/boards/dmida/mach.c linux/arch/sh/boards/dmida/mach.c
--- linux.backup/arch/sh/boards/dmida/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/dmida/mach.c Sat Aug 16 15:45:00 2003
@@ -30,42 +30,42 @@
*/

struct sh_machine_vector mv_dmida __initmv = {
- mv_name: "DMIDA",
+ .mv_name = "DMIDA",

- mv_nr_irqs: HD64465_IRQ_BASE+HD64465_IRQ_NUM,
+ .mv_nr_irqs = HD64465_IRQ_BASE+HD64465_IRQ_NUM,

- mv_inb: hd64465_inb,
- mv_inw: hd64465_inw,
- mv_inl: hd64465_inl,
- mv_outb: hd64465_outb,
- mv_outw: hd64465_outw,
- mv_outl: hd64465_outl,
-
- mv_inb_p: hd64465_inb_p,
- mv_inw_p: hd64465_inw,
- mv_inl_p: hd64465_inl,
- mv_outb_p: hd64465_outb_p,
- mv_outw_p: hd64465_outw,
- mv_outl_p: hd64465_outl,
-
- mv_insb: hd64465_insb,
- mv_insw: hd64465_insw,
- mv_insl: hd64465_insl,
- mv_outsb: hd64465_outsb,
- mv_outsw: hd64465_outsw,
- mv_outsl: hd64465_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = hd64465_inb,
+ .mv_inw = hd64465_inw,
+ .mv_inl = hd64465_inl,
+ .mv_outb = hd64465_outb,
+ .mv_outw = hd64465_outw,
+ .mv_outl = hd64465_outl,
+
+ .mv_inb_p = hd64465_inb_p,
+ .mv_inw_p = hd64465_inw,
+ .mv_inl_p = hd64465_inl,
+ .mv_outb_p = hd64465_outb_p,
+ .mv_outw_p = hd64465_outw,
+ .mv_outl_p = hd64465_outl,
+
+ .mv_insb = hd64465_insb,
+ .mv_insw = hd64465_insw,
+ .mv_insl = hd64465_insl,
+ .mv_outsb = hd64465_outsb,
+ .mv_outsw = hd64465_outsw,
+ .mv_outsl = hd64465_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_irq_demux: hd64465_irq_demux,
+ .mv_irq_demux = hd64465_irq_demux,

- mv_rtc_gettimeofday: sh_rtc_gettimeofday,
- mv_rtc_settimeofday: sh_rtc_settimeofday,
+ .mv_rtc_gettimeofday = sh_rtc_gettimeofday,
+ .mv_rtc_settimeofday = sh_rtc_settimeofday,
};
ALIAS_MV(dmida)

diff -aur linux.backup/arch/sh/boards/dreamcast/irq.c linux/arch/sh/boards/dreamcast/irq.c
--- linux.backup/arch/sh/boards/dreamcast/irq.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/dreamcast/irq.c Sat Aug 16 18:12:52 2003
@@ -110,13 +110,13 @@
}

struct hw_interrupt_type systemasic_int = {
- typename: "System ASIC",
- startup: startup_systemasic_irq,
- shutdown: shutdown_systemasic_irq,
- enable: enable_systemasic_irq,
- disable: disable_systemasic_irq,
- ack: ack_systemasic_irq,
- end: end_systemasic_irq,
+ .typename = "System ASIC",
+ .startup = startup_systemasic_irq,
+ .shutdown = shutdown_systemasic_irq,
+ .enable = enable_systemasic_irq,
+ .disable = disable_systemasic_irq,
+ .ack = ack_systemasic_irq,
+ .end = end_systemasic_irq,
};

/*
diff -aur linux.backup/arch/sh/boards/dreamcast/mach.c linux/arch/sh/boards/dreamcast/mach.c
--- linux.backup/arch/sh/boards/dreamcast/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/dreamcast/mach.c Sat Aug 16 15:45:00 2003
@@ -21,40 +21,40 @@
*/

struct sh_machine_vector mv_dreamcast __initmv = {
- mv_nr_irqs: NR_IRQS,
+ .mv_nr_irqs = NR_IRQS,

- mv_inb: generic_inb,
- mv_inw: generic_inw,
- mv_inl: generic_inl,
- mv_outb: generic_outb,
- mv_outw: generic_outw,
- mv_outl: generic_outl,
-
- mv_inb_p: generic_inb_p,
- mv_inw_p: generic_inw,
- mv_inl_p: generic_inl,
- mv_outb_p: generic_outb_p,
- mv_outw_p: generic_outw,
- mv_outl_p: generic_outl,
-
- mv_insb: generic_insb,
- mv_insw: generic_insw,
- mv_insl: generic_insl,
- mv_outsb: generic_outsb,
- mv_outsw: generic_outsw,
- mv_outsl: generic_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = generic_inb,
+ .mv_inw = generic_inw,
+ .mv_inl = generic_inl,
+ .mv_outb = generic_outb,
+ .mv_outw = generic_outw,
+ .mv_outl = generic_outl,
+
+ .mv_inb_p = generic_inb_p,
+ .mv_inw_p = generic_inw,
+ .mv_inl_p = generic_inl,
+ .mv_outb_p = generic_outb_p,
+ .mv_outw_p = generic_outw,
+ .mv_outl_p = generic_outl,
+
+ .mv_insb = generic_insb,
+ .mv_insw = generic_insw,
+ .mv_insl = generic_insl,
+ .mv_outsb = generic_outsb,
+ .mv_outsw = generic_outsw,
+ .mv_outsl = generic_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: dreamcast_isa_port2addr,
- mv_irq_demux: systemasic_irq_demux,
+ .mv_isa_port2addr = dreamcast_isa_port2addr,
+ .mv_irq_demux = systemasic_irq_demux,
};
ALIAS_MV(dreamcast)
diff -aur linux.backup/arch/sh/boards/ec3104/irq.c linux/arch/sh/boards/ec3104/irq.c
--- linux.backup/arch/sh/boards/ec3104/irq.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/ec3104/irq.c Sat Aug 16 15:45:00 2003
@@ -169,13 +169,13 @@
}

static struct hw_interrupt_type ec3104_int = {
- typename: "EC3104",
- enable: enable_ec3104_irq,
- disable: disable_ec3104_irq,
- ack: mask_and_ack_ec3104_irq,
- end: end_ec3104_irq,
- startup: startup_ec3104_irq,
- shutdown: shutdown_ec3104_irq,
+ .typename = "EC3104",
+ .enable = enable_ec3104_irq,
+ .disable = disable_ec3104_irq,
+ .ack = mask_and_ack_ec3104_irq,
+ .end = end_ec3104_irq,
+ .startup = startup_ec3104_irq,
+ .shutdown = shutdown_ec3104_irq,
};

/* Yuck. the _demux API is ugly */
diff -aur linux.backup/arch/sh/boards/ec3104/mach.c linux/arch/sh/boards/ec3104/mach.c
--- linux.backup/arch/sh/boards/ec3104/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/ec3104/mach.c Sat Aug 16 15:45:00 2003
@@ -28,42 +28,42 @@
*/

struct sh_machine_vector mv_ec3104 __initmv = {
- mv_name: "EC3104",
+ .mv_name = "EC3104",

- mv_nr_irqs: 96,
+ .mv_nr_irqs = 96,

- mv_inb: ec3104_inb,
- mv_inw: ec3104_inw,
- mv_inl: ec3104_inl,
- mv_outb: ec3104_outb,
- mv_outw: ec3104_outw,
- mv_outl: ec3104_outl,
-
- mv_inb_p: generic_inb_p,
- mv_inw_p: generic_inw,
- mv_inl_p: generic_inl,
- mv_outb_p: generic_outb_p,
- mv_outw_p: generic_outw,
- mv_outl_p: generic_outl,
-
- mv_insb: generic_insb,
- mv_insw: generic_insw,
- mv_insl: generic_insl,
- mv_outsb: generic_outsb,
- mv_outsw: generic_outsw,
- mv_outsl: generic_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = ec3104_inb,
+ .mv_inw = ec3104_inw,
+ .mv_inl = ec3104_inl,
+ .mv_outb = ec3104_outb,
+ .mv_outw = ec3104_outw,
+ .mv_outl = ec3104_outl,
+
+ .mv_inb_p = generic_inb_p,
+ .mv_inw_p = generic_inw,
+ .mv_inl_p = generic_inl,
+ .mv_outb_p = generic_outb_p,
+ .mv_outw_p = generic_outw,
+ .mv_outl_p = generic_outl,
+
+ .mv_insb = generic_insb,
+ .mv_insw = generic_insw,
+ .mv_insl = generic_insl,
+ .mv_outsb = generic_outsb,
+ .mv_outsw = generic_outsw,
+ .mv_outsl = generic_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_irq_demux: ec3104_irq_demux,
+ .mv_irq_demux = ec3104_irq_demux,

- mv_rtc_gettimeofday: sh_rtc_gettimeofday,
- mv_rtc_settimeofday: sh_rtc_settimeofday,
+ .mv_rtc_gettimeofday = sh_rtc_gettimeofday,
+ .mv_rtc_settimeofday = sh_rtc_settimeofday,
};

ALIAS_MV(ec3104)
diff -aur linux.backup/arch/sh/boards/harp/mach.c linux/arch/sh/boards/harp/mach.c
--- linux.backup/arch/sh/boards/harp/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/harp/mach.c Sat Aug 16 18:13:06 2003
@@ -26,46 +26,46 @@
*/

struct sh_machine_vector mv_harp __initmv = {
- mv_nr_irqs: 89 + HD64465_IRQ_NUM,
+ .mv_nr_irqs = 89 + HD64465_IRQ_NUM,

- mv_inb: hd64465_inb,
- mv_inw: hd64465_inw,
- mv_inl: hd64465_inl,
- mv_outb: hd64465_outb,
- mv_outw: hd64465_outw,
- mv_outl: hd64465_outl,
-
- mv_inb_p: hd64465_inb_p,
- mv_inw_p: hd64465_inw,
- mv_inl_p: hd64465_inl,
- mv_outb_p: hd64465_outb_p,
- mv_outw_p: hd64465_outw,
- mv_outl_p: hd64465_outl,
-
- mv_insb: hd64465_insb,
- mv_insw: hd64465_insw,
- mv_insl: hd64465_insl,
- mv_outsb: hd64465_outsb,
- mv_outsw: hd64465_outsw,
- mv_outsl: hd64465_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = hd64465_inb,
+ .mv_inw = hd64465_inw,
+ .mv_inl = hd64465_inl,
+ .mv_outb = hd64465_outb,
+ .mv_outw = hd64465_outw,
+ .mv_outl = hd64465_outl,
+
+ .mv_inb_p = hd64465_inb_p,
+ .mv_inw_p = hd64465_inw,
+ .mv_inl_p = hd64465_inl,
+ .mv_outb_p = hd64465_outb_p,
+ .mv_outw_p = hd64465_outw,
+ .mv_outl_p = hd64465_outl,
+
+ .mv_insb = hd64465_insb,
+ .mv_insw = hd64465_insw,
+ .mv_insl = hd64465_insl,
+ .mv_outsb = hd64465_outsb,
+ .mv_outsw = hd64465_outsw,
+ .mv_outsl = hd64465_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: hd64465_isa_port2addr,
+ .mv_isa_port2addr = hd64465_isa_port2addr,

#ifdef CONFIG_PCI
- mv_init_irq: init_harp_irq,
+ .mv_init_irq = init_harp_irq,
#endif
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_harp,
+ .mv_heartbeat = heartbeat_harp,
#endif
};

diff -aur linux.backup/arch/sh/boards/hp6xx/hp620/mach.c linux/arch/sh/boards/hp6xx/hp620/mach.c
--- linux.backup/arch/sh/boards/hp6xx/hp620/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/hp6xx/hp620/mach.c Sat Aug 16 15:45:00 2003
@@ -24,41 +24,41 @@
*/

struct sh_machine_vector mv_hp620 __initmv = {
- mv_name: "hp620",
+ .mv_name = "hp620",

- mv_nr_irqs: HD64461_IRQBASE+HD64461_IRQ_NUM,
+ .mv_nr_irqs = HD64461_IRQBASE+HD64461_IRQ_NUM,

- mv_inb: hd64461_inb,
- mv_inw: hd64461_inw,
- mv_inl: hd64461_inl,
- mv_outb: hd64461_outb,
- mv_outw: hd64461_outw,
- mv_outl: hd64461_outl,
-
- mv_inb_p: hd64461_inb_p,
- mv_inw_p: hd64461_inw,
- mv_inl_p: hd64461_inl,
- mv_outb_p: hd64461_outb_p,
- mv_outw_p: hd64461_outw,
- mv_outl_p: hd64461_outl,
-
- mv_insb: hd64461_insb,
- mv_insw: hd64461_insw,
- mv_insl: hd64461_insl,
- mv_outsb: hd64461_outsb,
- mv_outsw: hd64461_outsw,
- mv_outsl: hd64461_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = hd64461_inb,
+ .mv_inw = hd64461_inw,
+ .mv_inl = hd64461_inl,
+ .mv_outb = hd64461_outb,
+ .mv_outw = hd64461_outw,
+ .mv_outl = hd64461_outl,
+
+ .mv_inb_p = hd64461_inb_p,
+ .mv_inw_p = hd64461_inw,
+ .mv_inl_p = hd64461_inl,
+ .mv_outb_p = hd64461_outb_p,
+ .mv_outw_p = hd64461_outw,
+ .mv_outl_p = hd64461_outl,
+
+ .mv_insb = hd64461_insb,
+ .mv_insw = hd64461_insw,
+ .mv_insl = hd64461_insl,
+ .mv_outsb = hd64461_outsb,
+ .mv_outsw = hd64461_outsw,
+ .mv_outsl = hd64461_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_irq_demux: hd64461_irq_demux,
+ .mv_irq_demux = hd64461_irq_demux,

- mv_rtc_gettimeofday: sh_rtc_gettimeofday,
- mv_rtc_settimeofday: sh_rtc_settimeofday,
+ .mv_rtc_gettimeofday = sh_rtc_gettimeofday,
+ .mv_rtc_settimeofday = sh_rtc_settimeofday,
};
ALIAS_MV(hp620)
diff -aur linux.backup/arch/sh/boards/hp6xx/hp680/mach.c linux/arch/sh/boards/hp6xx/hp680/mach.c
--- linux.backup/arch/sh/boards/hp6xx/hp680/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/hp6xx/hp680/mach.c Sat Aug 16 15:45:00 2003
@@ -20,41 +20,41 @@
#include <asm/irq.h>

struct sh_machine_vector mv_hp680 __initmv = {
- mv_name: "hp680",
+ .mv_name = "hp680",

- mv_nr_irqs: HD64461_IRQBASE+HD64461_IRQ_NUM,
+ .mv_nr_irqs = HD64461_IRQBASE+HD64461_IRQ_NUM,

- mv_inb: hd64461_inb,
- mv_inw: hd64461_inw,
- mv_inl: hd64461_inl,
- mv_outb: hd64461_outb,
- mv_outw: hd64461_outw,
- mv_outl: hd64461_outl,
-
- mv_inb_p: hd64461_inb_p,
- mv_inw_p: hd64461_inw,
- mv_inl_p: hd64461_inl,
- mv_outb_p: hd64461_outb_p,
- mv_outw_p: hd64461_outw,
- mv_outl_p: hd64461_outl,
-
- mv_insb: hd64461_insb,
- mv_insw: hd64461_insw,
- mv_insl: hd64461_insl,
- mv_outsb: hd64461_outsb,
- mv_outsw: hd64461_outsw,
- mv_outsl: hd64461_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = hd64461_inb,
+ .mv_inw = hd64461_inw,
+ .mv_inl = hd64461_inl,
+ .mv_outb = hd64461_outb,
+ .mv_outw = hd64461_outw,
+ .mv_outl = hd64461_outl,
+
+ .mv_inb_p = hd64461_inb_p,
+ .mv_inw_p = hd64461_inw,
+ .mv_inl_p = hd64461_inl,
+ .mv_outb_p = hd64461_outb_p,
+ .mv_outw_p = hd64461_outw,
+ .mv_outl_p = hd64461_outl,
+
+ .mv_insb = hd64461_insb,
+ .mv_insw = hd64461_insw,
+ .mv_insl = hd64461_insl,
+ .mv_outsb = hd64461_outsb,
+ .mv_outsw = hd64461_outsw,
+ .mv_outsl = hd64461_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_irq_demux: hd64461_irq_demux,
+ .mv_irq_demux = hd64461_irq_demux,

- mv_rtc_gettimeofday: sh_rtc_gettimeofday,
- mv_rtc_settimeofday: sh_rtc_settimeofday,
+ .mv_rtc_gettimeofday = sh_rtc_gettimeofday,
+ .mv_rtc_settimeofday = sh_rtc_settimeofday,
};
ALIAS_MV(hp680)
diff -aur linux.backup/arch/sh/boards/hp6xx/hp690/mach.c linux/arch/sh/boards/hp6xx/hp690/mach.c
--- linux.backup/arch/sh/boards/hp6xx/hp690/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/hp6xx/hp690/mach.c Sat Aug 16 15:45:00 2003
@@ -20,41 +20,41 @@
#include <asm/irq.h>

struct sh_machine_vector mv_hp690 __initmv = {
- mv_name: "hp690",
+ .mv_name = "hp690",

- mv_nr_irqs: HD64461_IRQBASE+HD64461_IRQ_NUM,
+ .mv_nr_irqs = HD64461_IRQBASE+HD64461_IRQ_NUM,

- mv_inb: hd64461_inb,
- mv_inw: hd64461_inw,
- mv_inl: hd64461_inl,
- mv_outb: hd64461_outb,
- mv_outw: hd64461_outw,
- mv_outl: hd64461_outl,
-
- mv_inb_p: hd64461_inb_p,
- mv_inw_p: hd64461_inw,
- mv_inl_p: hd64461_inl,
- mv_outb_p: hd64461_outb_p,
- mv_outw_p: hd64461_outw,
- mv_outl_p: hd64461_outl,
-
- mv_insb: hd64461_insb,
- mv_insw: hd64461_insw,
- mv_insl: hd64461_insl,
- mv_outsb: hd64461_outsb,
- mv_outsw: hd64461_outsw,
- mv_outsl: hd64461_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = hd64461_inb,
+ .mv_inw = hd64461_inw,
+ .mv_inl = hd64461_inl,
+ .mv_outb = hd64461_outb,
+ .mv_outw = hd64461_outw,
+ .mv_outl = hd64461_outl,
+
+ .mv_inb_p = hd64461_inb_p,
+ .mv_inw_p = hd64461_inw,
+ .mv_inl_p = hd64461_inl,
+ .mv_outb_p = hd64461_outb_p,
+ .mv_outw_p = hd64461_outw,
+ .mv_outl_p = hd64461_outl,
+
+ .mv_insb = hd64461_insb,
+ .mv_insw = hd64461_insw,
+ .mv_insl = hd64461_insl,
+ .mv_outsb = hd64461_outsb,
+ .mv_outsw = hd64461_outsw,
+ .mv_outsl = hd64461_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_irq_demux: hd64461_irq_demux,
+ .mv_irq_demux = hd64461_irq_demux,

- mv_rtc_gettimeofday: sh_rtc_gettimeofday,
- mv_rtc_settimeofday: sh_rtc_settimeofday,
+ .mv_rtc_gettimeofday = sh_rtc_gettimeofday,
+ .mv_rtc_settimeofday = sh_rtc_settimeofday,
};
ALIAS_MV(hp690)
diff -aur linux.backup/arch/sh/boards/overdrive/mach.c linux/arch/sh/boards/overdrive/mach.c
--- linux.backup/arch/sh/boards/overdrive/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/overdrive/mach.c Sat Aug 16 15:45:00 2003
@@ -28,46 +28,46 @@
*/

struct sh_machine_vector mv_od __initmv = {
- mv_nr_irqs: 48,
+ .mv_nr_irqs = 48,

- mv_inb: od_inb,
- mv_inw: od_inw,
- mv_inl: od_inl,
- mv_outb: od_outb,
- mv_outw: od_outw,
- mv_outl: od_outl,
-
- mv_inb_p: od_inb_p,
- mv_inw_p: od_inw_p,
- mv_inl_p: od_inl_p,
- mv_outb_p: od_outb_p,
- mv_outw_p: od_outw_p,
- mv_outl_p: od_outl_p,
-
- mv_insb: od_insb,
- mv_insw: od_insw,
- mv_insl: od_insl,
- mv_outsb: od_outsb,
- mv_outsw: od_outsw,
- mv_outsl: od_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = od_inb,
+ .mv_inw = od_inw,
+ .mv_inl = od_inl,
+ .mv_outb = od_outb,
+ .mv_outw = od_outw,
+ .mv_outl = od_outl,
+
+ .mv_inb_p = od_inb_p,
+ .mv_inw_p = od_inw_p,
+ .mv_inl_p = od_inl_p,
+ .mv_outb_p = od_outb_p,
+ .mv_outw_p = od_outw_p,
+ .mv_outl_p = od_outl_p,
+
+ .mv_insb = od_insb,
+ .mv_insw = od_insw,
+ .mv_insl = od_insl,
+ .mv_outsb = od_outsb,
+ .mv_outsw = od_outsw,
+ .mv_outsl = od_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: generic_isa_port2addr,
+ .mv_isa_port2addr = generic_isa_port2addr,

#ifdef CONFIG_PCI
- mv_init_irq: init_overdrive_irq,
+ .mv_init_irq = init_overdrive_irq,
#endif
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_od,
+ .mv_heartbeat = heartbeat_od,
#endif
};

diff -aur linux.backup/arch/sh/boards/saturn/irq.c linux/arch/sh/boards/saturn/irq.c
--- linux.backup/arch/sh/boards/saturn/irq.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/saturn/irq.c Sat Aug 16 15:45:00 2003
@@ -102,13 +102,13 @@
}

static struct hw_interrupt_type saturn_int = {
- typename: "Saturn",
- enable: enable_saturn_irq,
- disable: disable_saturn_irq,
- ack: mask_and_ack_saturn_irq,
- end: end_saturn_irq,
- startup: startup_saturn_irq,
- shutdown: shutdown_saturn_irq,
+ .typename = "Saturn",
+ .enable = enable_saturn_irq,
+ .disable = disable_saturn_irq,
+ .ack = mask_and_ack_saturn_irq,
+ .end = end_saturn_irq,
+ .startup = startup_saturn_irq,
+ .shutdown = shutdown_saturn_irq,
};

int saturn_irq_demux(int irq_nr)
diff -aur linux.backup/arch/sh/boards/saturn/mach.c linux/arch/sh/boards/saturn/mach.c
--- linux.backup/arch/sh/boards/saturn/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/saturn/mach.c Sat Aug 16 18:14:01 2003
@@ -18,41 +18,41 @@
* The Machine Vector
*/
struct sh_machine_vector mv_saturn __initmv = {
- mv_nr_irqs: 80, /* Fix this later */
+ .mv_nr_irqs = 80, /* Fix this later */

- mv_inb: generic_inb,
- mv_inw: generic_inw,
- mv_inl: generic_inl,
- mv_outb: generic_outb,
- mv_outw: generic_outw,
- mv_outl: generic_outl,
-
- mv_inb_p: generic_inb_p,
- mv_inw_p: generic_inw_p,
- mv_inl_p: generic_inl_p,
- mv_outb_p: generic_outb_p,
- mv_outw_p: generic_outw_p,
- mv_outl_p: generic_outl_p,
-
- mv_insb: generic_insb,
- mv_insw: generic_insw,
- mv_insl: generic_insl,
- mv_outsb: generic_outsb,
- mv_outsw: generic_outsw,
- mv_outsl: generic_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = generic_inb,
+ .mv_inw = generic_inw,
+ .mv_inl = generic_inl,
+ .mv_outb = generic_outb,
+ .mv_outw = generic_outw,
+ .mv_outl = generic_outl,
+
+ .mv_inb_p = generic_inb_p,
+ .mv_inw_p = generic_inw_p,
+ .mv_inl_p = generic_inl_p,
+ .mv_outb_p = generic_outb_p,
+ .mv_outw_p = generic_outw_p,
+ .mv_outl_p = generic_outl_p,
+
+ .mv_insb = generic_insb,
+ .mv_insw = generic_insw,
+ .mv_insl = generic_insl,
+ .mv_outsb = generic_outsb,
+ .mv_outsw = generic_outsw,
+ .mv_outsl = generic_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_isa_port2addr: saturn_isa_port2addr,
- mv_irq_demux: saturn_irq_demux,
+ .mv_isa_port2addr = saturn_isa_port2addr,
+ .mv_irq_demux = saturn_irq_demux,

- mv_ioremap: saturn_ioremap,
- mv_iounmap: saturn_iounmap,
+ .mv_ioremap = saturn_ioremap,
+ .mv_iounmap = saturn_iounmap,
};

ALIAS_MV(saturn)
diff -aur linux.backup/arch/sh/boards/se/770x/mach.c linux/arch/sh/boards/se/770x/mach.c
--- linux.backup/arch/sh/boards/se/770x/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/se/770x/mach.c Sat Aug 16 15:45:00 2003
@@ -28,49 +28,49 @@

struct sh_machine_vector mv_se __initmv = {
#if defined(CONFIG_CPU_SH4)
- mv_nr_irqs: 48,
+ .mv_nr_irqs = 48,
#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
- mv_nr_irqs: 32,
+ .mv_nr_irqs = 32,
#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
- mv_nr_irqs: 61,
+ .mv_nr_irqs = 61,
#endif

- mv_inb: se_inb,
- mv_inw: se_inw,
- mv_inl: se_inl,
- mv_outb: se_outb,
- mv_outw: se_outw,
- mv_outl: se_outl,
-
- mv_inb_p: se_inb_p,
- mv_inw_p: se_inw,
- mv_inl_p: se_inl,
- mv_outb_p: se_outb_p,
- mv_outw_p: se_outw,
- mv_outl_p: se_outl,
-
- mv_insb: se_insb,
- mv_insw: se_insw,
- mv_insl: se_insl,
- mv_outsb: se_outsb,
- mv_outsw: se_outsw,
- mv_outsl: se_outsl,
-
- mv_readb: se_readb,
- mv_readw: se_readw,
- mv_readl: se_readl,
- mv_writeb: se_writeb,
- mv_writew: se_writew,
- mv_writel: se_writel,
+ .mv_inb = se_inb,
+ .mv_inw = se_inw,
+ .mv_inl = se_inl,
+ .mv_outb = se_outb,
+ .mv_outw = se_outw,
+ .mv_outl = se_outl,
+
+ .mv_inb_p = se_inb_p,
+ .mv_inw_p = se_inw,
+ .mv_inl_p = se_inl,
+ .mv_outb_p = se_outb_p,
+ .mv_outw_p = se_outw,
+ .mv_outl_p = se_outl,
+
+ .mv_insb = se_insb,
+ .mv_insw = se_insw,
+ .mv_insl = se_insl,
+ .mv_outsb = se_outsb,
+ .mv_outsw = se_outsw,
+ .mv_outsl = se_outsl,
+
+ .mv_readb = se_readb,
+ .mv_readw = se_readw,
+ .mv_readl = se_readl,
+ .mv_writeb = se_writeb,
+ .mv_writew = se_writew,
+ .mv_writel = se_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: se_isa_port2addr,
+ .mv_isa_port2addr = se_isa_port2addr,

- mv_init_irq: init_se_IRQ,
+ .mv_init_irq = init_se_IRQ,
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_se,
+ .mv_heartbeat = heartbeat_se,
#endif
};
ALIAS_MV(se)
diff -aur linux.backup/arch/sh/boards/se/7751/mach.c linux/arch/sh/boards/se/7751/mach.c
--- linux.backup/arch/sh/boards/se/7751/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/se/7751/mach.c Sat Aug 16 15:45:00 2003
@@ -26,44 +26,44 @@
*/

struct sh_machine_vector mv_7751se __initmv = {
- mv_nr_irqs: 72,
+ .mv_nr_irqs = 72,

- mv_inb: sh7751se_inb,
- mv_inw: sh7751se_inw,
- mv_inl: sh7751se_inl,
- mv_outb: sh7751se_outb,
- mv_outw: sh7751se_outw,
- mv_outl: sh7751se_outl,
-
- mv_inb_p: sh7751se_inb_p,
- mv_inw_p: sh7751se_inw,
- mv_inl_p: sh7751se_inl,
- mv_outb_p: sh7751se_outb_p,
- mv_outw_p: sh7751se_outw,
- mv_outl_p: sh7751se_outl,
-
- mv_insb: sh7751se_insb,
- mv_insw: sh7751se_insw,
- mv_insl: sh7751se_insl,
- mv_outsb: sh7751se_outsb,
- mv_outsw: sh7751se_outsw,
- mv_outsl: sh7751se_outsl,
-
- mv_readb: sh7751se_readb,
- mv_readw: sh7751se_readw,
- mv_readl: sh7751se_readl,
- mv_writeb: sh7751se_writeb,
- mv_writew: sh7751se_writew,
- mv_writel: sh7751se_writel,
+ .mv_inb = sh7751se_inb,
+ .mv_inw = sh7751se_inw,
+ .mv_inl = sh7751se_inl,
+ .mv_outb = sh7751se_outb,
+ .mv_outw = sh7751se_outw,
+ .mv_outl = sh7751se_outl,
+
+ .mv_inb_p = sh7751se_inb_p,
+ .mv_inw_p = sh7751se_inw,
+ .mv_inl_p = sh7751se_inl,
+ .mv_outb_p = sh7751se_outb_p,
+ .mv_outw_p = sh7751se_outw,
+ .mv_outl_p = sh7751se_outl,
+
+ .mv_insb = sh7751se_insb,
+ .mv_insw = sh7751se_insw,
+ .mv_insl = sh7751se_insl,
+ .mv_outsb = sh7751se_outsb,
+ .mv_outsw = sh7751se_outsw,
+ .mv_outsl = sh7751se_outsl,
+
+ .mv_readb = sh7751se_readb,
+ .mv_readw = sh7751se_readw,
+ .mv_readl = sh7751se_readl,
+ .mv_writeb = sh7751se_writeb,
+ .mv_writew = sh7751se_writew,
+ .mv_writel = sh7751se_writel,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,

- mv_isa_port2addr: sh7751se_isa_port2addr,
+ .mv_isa_port2addr = sh7751se_isa_port2addr,

- mv_init_irq: init_7751se_IRQ,
+ .mv_init_irq = init_7751se_IRQ,
#ifdef CONFIG_HEARTBEAT
- mv_heartbeat: heartbeat_7751se,
+ .mv_heartbeat = heartbeat_7751se,
#endif
};
ALIAS_MV(7751se)
diff -aur linux.backup/arch/sh/boards/sh2000/mach.c linux/arch/sh/boards/sh2000/mach.c
--- linux.backup/arch/sh/boards/sh2000/mach.c Mon Jul 21 23:34:54 2003
+++ linux/arch/sh/boards/sh2000/mach.c Sat Aug 16 15:45:00 2003
@@ -19,39 +19,39 @@
*/

struct sh_machine_vector mv_sh2000 __initmv = {
- mv_nr_irqs: 80,
+ .mv_nr_irqs = 80,

- mv_inb: generic_inb,
- mv_inw: generic_inw,
- mv_inl: generic_inl,
- mv_outb: generic_outb,
- mv_outw: generic_outw,
- mv_outl: generic_outl,
-
- mv_inb_p: generic_inb_p,
- mv_inw_p: generic_inw_p,
- mv_inl_p: generic_inl_p,
- mv_outb_p: generic_outb_p,
- mv_outw_p: generic_outw_p,
- mv_outl_p: generic_outl_p,
-
- mv_insb: generic_insb,
- mv_insw: generic_insw,
- mv_insl: generic_insl,
- mv_outsb: generic_outsb,
- mv_outsw: generic_outsw,
- mv_outsl: generic_outsl,
-
- mv_readb: generic_readb,
- mv_readw: generic_readw,
- mv_readl: generic_readl,
- mv_writeb: generic_writeb,
- mv_writew: generic_writew,
- mv_writel: generic_writel,
+ .mv_inb = generic_inb,
+ .mv_inw = generic_inw,
+ .mv_inl = generic_inl,
+ .mv_outb = generic_outb,
+ .mv_outw = generic_outw,
+ .mv_outl = generic_outl,
+
+ .mv_inb_p = generic_inb_p,
+ .mv_inw_p = generic_inw_p,
+ .mv_inl_p = generic_inl_p,
+ .mv_outb_p = generic_outb_p,
+ .mv_outw_p = generic_outw_p,
+ .mv_outl_p = generic_outl_p,
+
+ .mv_insb = generic_insb,
+ .mv_insw = generic_insw,
+ .mv_insl = generic_insl,
+ .mv_outsb = generic_outsb,
+ .mv_outsw = generic_outsw,
+ .mv_outsl = generic_outsl,
+
+ .mv_readb = generic_readb,
+ .mv_readw = generic_readw,
+ .mv_readl = generic_readl,
+ .mv_writeb = generic_writeb,
+ .mv_writew = generic_writew,
+ .mv_writel = generic_writel,

- mv_isa_port2addr: sh2000_isa_port2addr,
+ .mv_isa_port2addr = sh2000_isa_port2addr,

- mv_ioremap: generic_ioremap,
- mv_iounmap: generic_iounmap,
+ .mv_ioremap = generic_ioremap,
+ .mv_iounmap = generic_iounmap,
};
ALIAS_MV(sh2000)
diff -aur linux.backup/arch/sh/boards/unknown/mach.c linux/arch/sh/boards/unknown/mach.c
--- linux.backup/arch/sh/boards/unknown/mach.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/boards/unknown/mach.c Sat Aug 16 15:45:00 2003
@@ -24,44 +24,44 @@

struct sh_machine_vector mv_unknown __initmv = {
#if defined(CONFIG_CPU_SH4)
- mv_nr_irqs: 48,
+ .mv_nr_irqs = 48,
#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
- mv_nr_irqs: 32,
+ .mv_nr_irqs = 32,
#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
- mv_nr_irqs: 61,
+ .mv_nr_irqs = 61,
#endif

- mv_inb: unknown_inb,
- mv_inw: unknown_inw,
- mv_inl: unknown_inl,
- mv_outb: unknown_outb,
- mv_outw: unknown_outw,
- mv_outl: unknown_outl,
-
- mv_inb_p: unknown_inb_p,
- mv_inw_p: unknown_inw_p,
- mv_inl_p: unknown_inl_p,
- mv_outb_p: unknown_outb_p,
- mv_outw_p: unknown_outw_p,
- mv_outl_p: unknown_outl_p,
-
- mv_insb: unknown_insb,
- mv_insw: unknown_insw,
- mv_insl: unknown_insl,
- mv_outsb: unknown_outsb,
- mv_outsw: unknown_outsw,
- mv_outsl: unknown_outsl,
-
- mv_readb: unknown_readb,
- mv_readw: unknown_readw,
- mv_readl: unknown_readl,
- mv_writeb: unknown_writeb,
- mv_writew: unknown_writew,
- mv_writel: unknown_writel,
+ .mv_inb = unknown_inb,
+ .mv_inw = unknown_inw,
+ .mv_inl = unknown_inl,
+ .mv_outb = unknown_outb,
+ .mv_outw = unknown_outw,
+ .mv_outl = unknown_outl,
+
+ .mv_inb_p = unknown_inb_p,
+ .mv_inw_p = unknown_inw_p,
+ .mv_inl_p = unknown_inl_p,
+ .mv_outb_p = unknown_outb_p,
+ .mv_outw_p = unknown_outw_p,
+ .mv_outl_p = unknown_outl_p,
+
+ .mv_insb = unknown_insb,
+ .mv_insw = unknown_insw,
+ .mv_insl = unknown_insl,
+ .mv_outsb = unknown_outsb,
+ .mv_outsw = unknown_outsw,
+ .mv_outsl = unknown_outsl,
+
+ .mv_readb = unknown_readb,
+ .mv_readw = unknown_readw,
+ .mv_readl = unknown_readl,
+ .mv_writeb = unknown_writeb,
+ .mv_writew = unknown_writew,
+ .mv_writel = unknown_writel,

- mv_ioremap: unknown_ioremap,
- mv_iounmap: unknown_iounmap,
+ .mv_ioremap = unknown_ioremap,
+ .mv_iounmap = unknown_iounmap,

- mv_isa_port2addr: unknown_isa_port2addr,
+ .mv_isa_port2addr = unknown_isa_port2addr,
};
ALIAS_MV(unknown)
diff -aur linux.backup/arch/sh/cchips/hd6446x/hd64465/setup.c linux/arch/sh/cchips/hd6446x/hd64465/setup.c
--- linux.backup/arch/sh/cchips/hd6446x/hd64465/setup.c Thu Jun 26 23:47:25 2003
+++ linux/arch/sh/cchips/hd6446x/hd64465/setup.c Sat Aug 16 18:14:54 2003
@@ -89,13 +89,13 @@

static struct hw_interrupt_type hd64465_irq_type = {
- typename: "HD64465-IRQ",
- startup: startup_hd64465_irq,
- shutdown: shutdown_hd64465_irq,
- enable: enable_hd64465_irq,
- disable: disable_hd64465_irq,
- ack: mask_and_ack_hd64465,
- end: end_hd64465_irq
+ .typename = "HD64465-IRQ",
+ .startup = startup_hd64465_irq,
+ .shutdown = shutdown_hd64465_irq,
+ .enable = enable_hd64465_irq,
+ .disable = disable_hd64465_irq,
+ .ack = mask_and_ack_hd64465,
+ .end = end_hd64465_irq
};