From: CaT <cat@zip.com.au>
Convert a whole bunch of struct initialisers into c99 format.
arch/alpha/kernel/core_titan.c | 12
arch/arm/kernel/apm.c | 18 -
arch/arm26/kernel/setup.c | 12
arch/cris/arch-v10/drivers/pcf8563.c | 8
arch/h8300/kernel/setup.c | 20 -
arch/ia64/hp/common/sba_iommu.c | 8
arch/ia64/kernel/perfmon.c | 2
arch/ia64/sn/io/drivers/ioconfig_bus.c | 6
arch/ia64/sn/io/sn2/shub.c | 2
arch/ia64/sn/kernel/setup.c | 16 -
arch/mips/au1000/common/dma.c | 16 -
arch/mips/sibyte/cfe/console.c | 12
arch/mips/tx4927/common/tx4927_irq.c | 32 +-
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 32 +-
arch/mips/vr41xx/common/vrc4173.c | 8
arch/ppc64/kernel/proc_ppc64.c | 6
arch/ppc64/kernel/scanlog.c | 10
arch/sh/boards/adx/mach.c | 64 ++---
arch/sh/boards/bigsur/mach.c | 68 ++---
arch/sh/boards/cat68701/mach.c | 68 ++---
arch/sh/boards/cqreek/mach.c | 68 ++---
arch/sh/boards/dmida/mach.c | 64 ++---
arch/sh/boards/dreamcast/irq.c | 14 -
arch/sh/boards/dreamcast/mach.c | 64 ++---
arch/sh/boards/ec3104/irq.c | 14 -
arch/sh/boards/ec3104/mach.c | 64 ++---
arch/sh/boards/harp/mach.c | 66 ++---
arch/sh/boards/hp6xx/hp620/mach.c | 64 ++---
arch/sh/boards/hp6xx/hp680/mach.c | 64 ++---
arch/sh/boards/hp6xx/hp690/mach.c | 64 ++---
arch/sh/boards/overdrive/mach.c | 66 ++---
arch/sh/boards/saturn/irq.c | 14 -
arch/sh/boards/saturn/mach.c | 64 ++---
arch/sh/boards/se/770x/mach.c | 70 ++---
arch/sh/boards/se/7751/mach.c | 66 ++---
arch/sh/boards/sh2000/mach.c | 62 ++---
arch/sh/boards/unknown/mach.c | 66 ++---
arch/sh/cchips/hd6446x/hd64465/setup.c | 14 -
drivers/char/lcd.c | 6
drivers/media/common/saa7146_video.c | 62 ++---
drivers/media/dvb/frontends/grundig_29504-401.c | 18 -
drivers/media/dvb/frontends/ves1820.c | 6
drivers/media/dvb/ttusb-dec/dec2000_frontend.c | 12
drivers/media/dvb/ttusb-dec/ttusb_dec.c | 8
drivers/mtd/maps/ceiva.c | 24 -
drivers/mtd/nand/autcpu12.c | 48 +--
drivers/mtd/nand/edb7312.c | 6
drivers/net/arm/ether00.c | 6
drivers/net/irda/via-ircc.c | 8
drivers/net/sungem_phy.c | 184 +++++++--------
drivers/s390/net/qeth.c | 16 -
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 8
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 8
drivers/scsi/nsp32.c | 14 -
drivers/video/68328fb.c | 12
drivers/video/riva/fbdev.c | 58 ++--
fs/affs/file.c | 4
fs/jffs2/wbuf.c | 4
include/asm-arm/proc-armo/processor.h | 2
include/asm-arm/xor.h | 10
include/asm-arm26/processor.h | 2
include/asm-arm26/xor.h | 10
scripts/kconfig/symbol.c | 24 -
sound/oss/ite8172.c | 8
64 files changed, 978 insertions(+), 978 deletions(-)
diff -puN arch/alpha/kernel/core_titan.c~c99-conversions arch/alpha/kernel/core_titan.c
--- 25/arch/alpha/kernel/core_titan.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/alpha/kernel/core_titan.c 2003-08-25 02:59:04.000000000 -0700
@@ -717,12 +717,12 @@ titan_agp_translate(alpha_agp_info *agp,
struct alpha_agp_ops titan_agp_ops =
{
- setup: titan_agp_setup,
- cleanup: titan_agp_cleanup,
- configure: titan_agp_configure,
- bind: titan_agp_bind_memory,
- unbind: titan_agp_unbind_memory,
- translate: titan_agp_translate
+ .setup = titan_agp_setup,
+ .cleanup = titan_agp_cleanup,
+ .configure = titan_agp_configure,
+ .bind = titan_agp_bind_memory,
+ .unbind = titan_agp_unbind_memory,
+ .translate = titan_agp_translate
};
alpha_agp_info *
diff -puN arch/arm26/kernel/setup.c~c99-conversions arch/arm26/kernel/setup.c
--- 25/arch/arm26/kernel/setup.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/arm26/kernel/setup.c 2003-08-25 02:59:04.000000000 -0700
@@ -304,12 +304,12 @@ __tagtable(ATAG_MEM, parse_tag_mem32);
#if defined(CONFIG_DUMMY_CONSOLE)
struct screen_info screen_info = {
- orig_video_lines: 30,
- orig_video_cols: 80,
- orig_video_mode: 0,
- orig_video_ega_bx: 0,
- orig_video_isVGA: 1,
- orig_video_points: 8
+ .orig_video_lines = 30,
+ .orig_video_cols = 80,
+ .orig_video_mode = 0,
+ .orig_video_ega_bx = 0,
+ .orig_video_isVGA = 1,
+ .orig_video_points = 8
};
static int __init parse_tag_videotext(const struct tag *tag)
diff -puN arch/arm/kernel/apm.c~c99-conversions arch/arm/kernel/apm.c
--- 25/arch/arm/kernel/apm.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/arm/kernel/apm.c 2003-08-25 02:59:04.000000000 -0700
@@ -388,18 +388,18 @@ static int apm_open(struct inode * inode
}
static struct file_operations apm_bios_fops = {
- owner: THIS_MODULE,
- read: apm_read,
- poll: apm_poll,
- ioctl: apm_ioctl,
- open: apm_open,
- release: apm_release,
+ .owner = THIS_MODULE,
+ .read = apm_read,
+ .poll = apm_poll,
+ .ioctl = apm_ioctl,
+ .open = apm_open,
+ .release = apm_release,
};
static struct miscdevice apm_device = {
- minor: APM_MINOR_DEV,
- name: "apm_bios",
- fops: &apm_bios_fops
+ .minor = APM_MINOR_DEV,
+ .name = "apm_bios",
+ .fops = &apm_bios_fops
};
diff -puN arch/cris/arch-v10/drivers/pcf8563.c~c99-conversions arch/cris/arch-v10/drivers/pcf8563.c
--- 25/arch/cris/arch-v10/drivers/pcf8563.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/cris/arch-v10/drivers/pcf8563.c 2003-08-25 02:59:04.000000000 -0700
@@ -57,10 +57,10 @@ int pcf8563_open(struct inode *, struct
int pcf8563_release(struct inode *, struct file *);
static struct file_operations pcf8563_fops = {
- owner: THIS_MODULE,
- ioctl: pcf8563_ioctl,
- open: pcf8563_open,
- release: pcf8563_release,
+ .owner = THIS_MODULE,
+ .ioctl = pcf8563_ioctl,
+ .open = pcf8563_open,
+ .release = pcf8563_release,
};
unsigned char
diff -puN arch/h8300/kernel/setup.c~c99-conversions arch/h8300/kernel/setup.c
--- 25/arch/h8300/kernel/setup.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/h8300/kernel/setup.c 2003-08-25 02:59:04.000000000 -0700
@@ -91,12 +91,12 @@ static int __init gdb_console_setup(stru
}
static const struct console gdb_console = {
- name: "gdb_con",
- write: gdb_console_output,
- device: NULL,
- setup: gdb_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = "gdb_con",
+ .write = gdb_console_output,
+ .device = NULL,
+ .setup = gdb_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
};
#endif
@@ -260,8 +260,8 @@ static void c_stop(struct seq_file *m, v
}
struct seq_operations cpuinfo_op = {
- start: c_start,
- next: c_next,
- stop: c_stop,
- show: show_cpuinfo,
+ .start = c_start,
+ .next = c_next,
+ .stop = c_stop,
+ .show = show_cpuinfo,
};
diff -puN arch/ia64/hp/common/sba_iommu.c~c99-conversions arch/ia64/hp/common/sba_iommu.c
--- 25/arch/ia64/hp/common/sba_iommu.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ia64/hp/common/sba_iommu.c 2003-08-25 02:59:04.000000000 -0700
@@ -1935,10 +1935,10 @@ acpi_sba_ioc_add(struct acpi_device *dev
}
static struct acpi_driver acpi_sba_ioc_driver = {
- name: "IOC IOMMU Driver",
- ids: "HWP0001,HWP0004",
- ops: {
- add: acpi_sba_ioc_add,
+ .name = "IOC IOMMU Driver",
+ .ids = "HWP0001,HWP0004",
+ .ops = {
+ .add = acpi_sba_ioc_add,
},
};
diff -puN arch/ia64/kernel/perfmon.c~c99-conversions arch/ia64/kernel/perfmon.c
--- 25/arch/ia64/kernel/perfmon.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ia64/kernel/perfmon.c 2003-08-25 02:59:04.000000000 -0700
@@ -2109,7 +2109,7 @@ pfmfs_delete_dentry(struct dentry *dentr
return 1;
}
static struct dentry_operations pfmfs_dentry_operations = {
- d_delete: pfmfs_delete_dentry,
+ .d_delete = pfmfs_delete_dentry,
};
diff -puN arch/ia64/sn/io/drivers/ioconfig_bus.c~c99-conversions arch/ia64/sn/io/drivers/ioconfig_bus.c
--- 25/arch/ia64/sn/io/drivers/ioconfig_bus.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ia64/sn/io/drivers/ioconfig_bus.c 2003-08-25 02:59:04.000000000 -0700
@@ -346,9 +346,9 @@ static int ioconfig_bus_close(struct ino
}
struct file_operations ioconfig_bus_fops = {
- ioctl:ioconfig_bus_ioctl,
- open:ioconfig_bus_open, /* open */
- release:ioconfig_bus_close /* release */
+ .ioctl = ioconfig_bus_ioctl,
+ .open = ioconfig_bus_open, /* open */
+ .release = ioconfig_bus_close /* release */
};
diff -puN arch/ia64/sn/io/sn2/shub.c~c99-conversions arch/ia64/sn/io/sn2/shub.c
--- 25/arch/ia64/sn/io/sn2/shub.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ia64/sn/io/sn2/shub.c 2003-08-25 02:59:04.000000000 -0700
@@ -243,7 +243,7 @@ shubstats_ioctl(struct inode *inode, str
}
struct file_operations shub_mon_fops = {
- ioctl: shubstats_ioctl,
+ .ioctl = shubstats_ioctl,
};
/*
diff -puN arch/ia64/sn/kernel/setup.c~c99-conversions arch/ia64/sn/kernel/setup.c
--- 25/arch/ia64/sn/kernel/setup.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ia64/sn/kernel/setup.c 2003-08-25 02:59:04.000000000 -0700
@@ -117,14 +117,14 @@ irqpda_t *irqpdaindr;
* VGA color display.
*/
struct screen_info sn_screen_info = {
- orig_x: 0,
- orig_y: 0,
- orig_video_mode: 3,
- orig_video_cols: 80,
- orig_video_ega_bx: 3,
- orig_video_lines: 25,
- orig_video_isVGA: 1,
- orig_video_points: 16
+ .orig_x = 0,
+ .orig_y = 0,
+ .orig_video_mode = 3,
+ .orig_video_cols = 80,
+ .orig_video_ega_bx = 3,
+ .orig_video_lines = 25,
+ .orig_video_isVGA = 1,
+ .orig_video_points = 16
};
/*
diff -puN arch/mips/au1000/common/dma.c~c99-conversions arch/mips/au1000/common/dma.c
--- 25/arch/mips/au1000/common/dma.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/mips/au1000/common/dma.c 2003-08-25 02:59:04.000000000 -0700
@@ -62,14 +62,14 @@
spinlock_t au1000_dma_spin_lock = SPIN_LOCK_UNLOCKED;
struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,},
- {dev_id:-1,}
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,},
+ {.dev_id = -1,}
};
// Device FIFO addresses and default DMA modes
diff -puN arch/mips/sibyte/cfe/console.c~c99-conversions arch/mips/sibyte/cfe/console.c
--- 25/arch/mips/sibyte/cfe/console.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/mips/sibyte/cfe/console.c 2003-08-25 02:59:04.000000000 -0700
@@ -74,12 +74,12 @@ static int cfe_console_setup(struct cons
}
static struct console sb1250_cfe_cons = {
- name: "cfe",
- write: cfe_console_write,
- device: cfe_console_device,
- setup: cfe_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = "cfe",
+ .write = cfe_console_write,
+ .device = cfe_console_device,
+ .setup = cfe_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
};
static int __init sb1250_cfe_console_init(void)
diff -puN arch/mips/tx4927/common/tx4927_irq.c~c99-conversions arch/mips/tx4927/common/tx4927_irq.c
--- 25/arch/mips/tx4927/common/tx4927_irq.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/mips/tx4927/common/tx4927_irq.c 2003-08-25 02:59:04.000000000 -0700
@@ -149,26 +149,26 @@ static spinlock_t tx4927_pic_lock = SPIN
#define TX4927_CP0_NAME "TX4927-CP0"
static struct hw_interrupt_type tx4927_irq_cp0_type = {
- typename: TX4927_CP0_NAME,
- startup: tx4927_irq_cp0_startup,
- shutdown: tx4927_irq_cp0_shutdown,
- enable: tx4927_irq_cp0_enable,
- disable: tx4927_irq_cp0_disable,
- ack: tx4927_irq_cp0_mask_and_ack,
- end: tx4927_irq_cp0_end,
- set_affinity: NULL
+ .typename = TX4927_CP0_NAME,
+ .startup = tx4927_irq_cp0_startup,
+ .shutdown = tx4927_irq_cp0_shutdown,
+ .enable = tx4927_irq_cp0_enable,
+ .disable = tx4927_irq_cp0_disable,
+ .ack = tx4927_irq_cp0_mask_and_ack,
+ .end = tx4927_irq_cp0_end,
+ .set_affinity = NULL
};
#define TX4927_PIC_NAME "TX4927-PIC"
static struct hw_interrupt_type tx4927_irq_pic_type = {
- typename: TX4927_PIC_NAME,
- startup: tx4927_irq_pic_startup,
- shutdown: tx4927_irq_pic_shutdown,
- enable: tx4927_irq_pic_enable,
- disable: tx4927_irq_pic_disable,
- ack: tx4927_irq_pic_mask_and_ack,
- end: tx4927_irq_pic_end,
- set_affinity: NULL
+ .typename = TX4927_PIC_NAME,
+ .startup = tx4927_irq_pic_startup,
+ .shutdown = tx4927_irq_pic_shutdown,
+ .enable = tx4927_irq_pic_enable,
+ .disable = tx4927_irq_pic_disable,
+ .ack = tx4927_irq_pic_mask_and_ack,
+ .end = tx4927_irq_pic_end,
+ .set_affinity = NULL
};
#define TX4927_PIC_ACTION(s) { no_action, 0, 0, s, NULL, NULL }
diff -puN arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c~c99-conversions arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
--- 25/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2003-08-25 02:59:04.000000000 -0700
@@ -255,14 +255,14 @@ static spinlock_t toshiba_rbtx4927_ioc_l
#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
static struct hw_interrupt_type toshiba_rbtx4927_irq_ioc_type = {
- typename:TOSHIBA_RBTX4927_IOC_NAME,
- startup:toshiba_rbtx4927_irq_ioc_startup,
- shutdown:toshiba_rbtx4927_irq_ioc_shutdown,
- enable:toshiba_rbtx4927_irq_ioc_enable,
- disable:toshiba_rbtx4927_irq_ioc_disable,
- ack:toshiba_rbtx4927_irq_ioc_mask_and_ack,
- end:toshiba_rbtx4927_irq_ioc_end,
- set_affinity:NULL
+ .typename = TOSHIBA_RBTX4927_IOC_NAME,
+ .startup = toshiba_rbtx4927_irq_ioc_startup,
+ .shutdown = toshiba_rbtx4927_irq_ioc_shutdown,
+ .enable = toshiba_rbtx4927_irq_ioc_enable,
+ .disable = toshiba_rbtx4927_irq_ioc_disable,
+ .ack = toshiba_rbtx4927_irq_ioc_mask_and_ack,
+ .end = toshiba_rbtx4927_irq_ioc_end,
+ .set_affinity = NULL
};
#define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000
#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
@@ -271,14 +271,14 @@ static struct hw_interrupt_type toshiba_
#ifdef CONFIG_TOSHIBA_FPCIB0
#define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"
static struct hw_interrupt_type toshiba_rbtx4927_irq_isa_type = {
- typename:TOSHIBA_RBTX4927_ISA_NAME,
- startup:toshiba_rbtx4927_irq_isa_startup,
- shutdown:toshiba_rbtx4927_irq_isa_shutdown,
- enable:toshiba_rbtx4927_irq_isa_enable,
- disable:toshiba_rbtx4927_irq_isa_disable,
- ack:toshiba_rbtx4927_irq_isa_mask_and_ack,
- end:toshiba_rbtx4927_irq_isa_end,
- set_affinity:NULL
+ .typename = TOSHIBA_RBTX4927_ISA_NAME,
+ .startup = toshiba_rbtx4927_irq_isa_startup,
+ .shutdown = toshiba_rbtx4927_irq_isa_shutdown,
+ .enable = toshiba_rbtx4927_irq_isa_enable,
+ .disable = toshiba_rbtx4927_irq_isa_disable,
+ .ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
+ .end = toshiba_rbtx4927_irq_isa_end,
+ .set_affinity = NULL
};
#endif
diff -puN arch/mips/vr41xx/common/vrc4173.c~c99-conversions arch/mips/vr41xx/common/vrc4173.c
--- 25/arch/mips/vr41xx/common/vrc4173.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/mips/vr41xx/common/vrc4173.c 2003-08-25 02:59:04.000000000 -0700
@@ -250,10 +250,10 @@ static int __devinit vrc4173_probe(struc
}
static struct pci_driver vrc4173_driver = {
- name: "NEC VRC4173",
- probe: vrc4173_probe,
- remove: NULL,
- id_table: vrc4173_table,
+ .name = "NEC VRC4173",
+ .probe = vrc4173_probe,
+ .remove = NULL,
+ .id_table = vrc4173_table,
};
static int __devinit vrc4173_init(void)
diff -puN arch/ppc64/kernel/proc_ppc64.c~c99-conversions arch/ppc64/kernel/proc_ppc64.c
--- 25/arch/ppc64/kernel/proc_ppc64.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ppc64/kernel/proc_ppc64.c 2003-08-25 02:59:04.000000000 -0700
@@ -47,9 +47,9 @@ static ssize_t page_map_read( struct fil
static int page_map_mmap( struct file *file, struct vm_area_struct *vma );
static struct file_operations page_map_fops = {
- llseek: page_map_seek,
- read: page_map_read,
- mmap: page_map_mmap
+ .llseek = page_map_seek,
+ .read = page_map_read,
+ .mmap = page_map_mmap
};
diff -puN arch/ppc64/kernel/scanlog.c~c99-conversions arch/ppc64/kernel/scanlog.c
--- 25/arch/ppc64/kernel/scanlog.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/ppc64/kernel/scanlog.c 2003-08-25 02:59:04.000000000 -0700
@@ -190,11 +190,11 @@ static int scanlog_release(struct inode
}
struct file_operations scanlog_fops = {
- owner: THIS_MODULE,
- read: scanlog_read,
- write: scanlog_write,
- open: scanlog_open,
- release: scanlog_release,
+ .owner = THIS_MODULE,
+ .read = scanlog_read,
+ .write = scanlog_write,
+ .open = scanlog_open,
+ .release = scanlog_release,
};
int __init scanlog_init(void)
diff -puN arch/sh/boards/adx/mach.c~c99-conversions arch/sh/boards/adx/mach.c
--- 25/arch/sh/boards/adx/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/adx/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -24,41 +24,41 @@ extern void init_adx_IRQ(void);
*/
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 -puN arch/sh/boards/bigsur/mach.c~c99-conversions arch/sh/boards/bigsur/mach.c
--- 25/arch/sh/boards/bigsur/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/bigsur/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -28,44 +28,44 @@ extern void heartbeat_bigsur(void);
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 -puN arch/sh/boards/cat68701/mach.c~c99-conversions arch/sh/boards/cat68701/mach.c
--- 25/arch/sh/boards/cat68701/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/cat68701/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/cqreek/mach.c~c99-conversions arch/sh/boards/cqreek/mach.c
--- 25/arch/sh/boards/cqreek/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/cqreek/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/dmida/mach.c~c99-conversions arch/sh/boards/dmida/mach.c
--- 25/arch/sh/boards/dmida/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/dmida/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/dreamcast/irq.c~c99-conversions arch/sh/boards/dreamcast/irq.c
--- 25/arch/sh/boards/dreamcast/irq.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/dreamcast/irq.c 2003-08-25 02:59:04.000000000 -0700
@@ -110,13 +110,13 @@ static void shutdown_systemasic_irq(unsi
}
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 -puN arch/sh/boards/dreamcast/mach.c~c99-conversions arch/sh/boards/dreamcast/mach.c
--- 25/arch/sh/boards/dreamcast/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/dreamcast/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -21,40 +21,40 @@ void __init dreamcast_pcibios_init(void)
*/
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 -puN arch/sh/boards/ec3104/irq.c~c99-conversions arch/sh/boards/ec3104/irq.c
--- 25/arch/sh/boards/ec3104/irq.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/ec3104/irq.c 2003-08-25 02:59:04.000000000 -0700
@@ -169,13 +169,13 @@ static void shutdown_ec3104_irq(unsigned
}
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 -puN arch/sh/boards/ec3104/mach.c~c99-conversions arch/sh/boards/ec3104/mach.c
--- 25/arch/sh/boards/ec3104/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/ec3104/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/harp/mach.c~c99-conversions arch/sh/boards/harp/mach.c
--- 25/arch/sh/boards/harp/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/harp/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -26,46 +26,46 @@ void heartbeat_harp(void);
*/
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 -puN arch/sh/boards/hp6xx/hp620/mach.c~c99-conversions arch/sh/boards/hp6xx/hp620/mach.c
--- 25/arch/sh/boards/hp6xx/hp620/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/hp6xx/hp620/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/hp6xx/hp680/mach.c~c99-conversions arch/sh/boards/hp6xx/hp680/mach.c
--- 25/arch/sh/boards/hp6xx/hp680/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/hp6xx/hp680/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/hp6xx/hp690/mach.c~c99-conversions arch/sh/boards/hp6xx/hp690/mach.c
--- 25/arch/sh/boards/hp6xx/hp690/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/hp6xx/hp690/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/overdrive/mach.c~c99-conversions arch/sh/boards/overdrive/mach.c
--- 25/arch/sh/boards/overdrive/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/overdrive/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -28,46 +28,46 @@ void galileo_pcibios_init(void);
*/
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 -puN arch/sh/boards/saturn/irq.c~c99-conversions arch/sh/boards/saturn/irq.c
--- 25/arch/sh/boards/saturn/irq.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/saturn/irq.c 2003-08-25 02:59:04.000000000 -0700
@@ -102,13 +102,13 @@ static void shutdown_saturn_irq(unsigned
}
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 -puN arch/sh/boards/saturn/mach.c~c99-conversions arch/sh/boards/saturn/mach.c
--- 25/arch/sh/boards/saturn/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/saturn/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/se/770x/mach.c~c99-conversions arch/sh/boards/se/770x/mach.c
--- 25/arch/sh/boards/se/770x/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/se/770x/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -28,49 +28,49 @@ void init_se_IRQ(void);
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 -puN arch/sh/boards/se/7751/mach.c~c99-conversions arch/sh/boards/se/7751/mach.c
--- 25/arch/sh/boards/se/7751/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/se/7751/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -26,44 +26,44 @@ void init_7751se_IRQ(void);
*/
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 -puN arch/sh/boards/sh2000/mach.c~c99-conversions arch/sh/boards/sh2000/mach.c
--- 25/arch/sh/boards/sh2000/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/sh2000/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/boards/unknown/mach.c~c99-conversions arch/sh/boards/unknown/mach.c
--- 25/arch/sh/boards/unknown/mach.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/boards/unknown/mach.c 2003-08-25 02:59:04.000000000 -0700
@@ -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 -puN arch/sh/cchips/hd6446x/hd64465/setup.c~c99-conversions arch/sh/cchips/hd6446x/hd64465/setup.c
--- 25/arch/sh/cchips/hd6446x/hd64465/setup.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/arch/sh/cchips/hd6446x/hd64465/setup.c 2003-08-25 02:59:04.000000000 -0700
@@ -89,13 +89,13 @@ static void shutdown_hd64465_irq(unsigne
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
};
diff -puN drivers/char/lcd.c~c99-conversions drivers/char/lcd.c
--- 25/drivers/char/lcd.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/char/lcd.c 2003-08-25 02:59:04.000000000 -0700
@@ -551,9 +551,9 @@ static long lcd_read(struct inode *inode
*/
static struct file_operations lcd_fops = {
- read: lcd_read,
- ioctl: lcd_ioctl,
- open: lcd_open,
+ .read = lcd_read,
+ .ioctl = lcd_ioctl,
+ .open = lcd_open,
};
static struct miscdevice lcd_dev=
diff -puN drivers/media/common/saa7146_video.c~c99-conversions drivers/media/common/saa7146_video.c
--- 25/drivers/media/common/saa7146_video.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/media/common/saa7146_video.c 2003-08-25 02:59:04.000000000 -0700
@@ -359,41 +359,41 @@ static int s_fmt(struct saa7146_fh *fh,
static struct v4l2_queryctrl controls[] = {
{
- id: V4L2_CID_BRIGHTNESS,
- name: "Brightness",
- minimum: 0,
- maximum: 255,
- step: 1,
- default_value: 128,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_BRIGHTNESS,
+ .name = "Brightness",
+ .minimum = 0,
+ .maximum = 255,
+ .step = 1,
+ .default_value = 128,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_CONTRAST,
- name: "Contrast",
- minimum: 0,
- maximum: 127,
- step: 1,
- default_value: 64,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_CONTRAST,
+ .name = "Contrast",
+ .minimum = 0,
+ .maximum = 127,
+ .step = 1,
+ .default_value = 64,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_SATURATION,
- name: "Saturation",
- minimum: 0,
- maximum: 127,
- step: 1,
- default_value: 64,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_SATURATION,
+ .name = "Saturation",
+ .minimum = 0,
+ .maximum = 127,
+ .step = 1,
+ .default_value = 64,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_VFLIP,
- name: "Vertical flip",
- minimum: 0,
- maximum: 1,
- type: V4L2_CTRL_TYPE_BOOLEAN,
+ .id = V4L2_CID_VFLIP,
+ .name = "Vertical flip",
+ .minimum = 0,
+ .maximum = 1,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
},{
- id: V4L2_CID_HFLIP,
- name: "Horizontal flip",
- minimum: 0,
- maximum: 1,
- type: V4L2_CTRL_TYPE_BOOLEAN,
+ .id = V4L2_CID_HFLIP,
+ .name = "Horizontal flip",
+ .minimum = 0,
+ .maximum = 1,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
},
};
static int NUM_CONTROLS = sizeof(controls)/sizeof(struct v4l2_queryctrl);
diff -puN drivers/media/dvb/frontends/grundig_29504-401.c~c99-conversions drivers/media/dvb/frontends/grundig_29504-401.c
--- 25/drivers/media/dvb/frontends/grundig_29504-401.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/media/dvb/frontends/grundig_29504-401.c 2003-08-25 02:59:04.000000000 -0700
@@ -37,15 +37,15 @@ static int debug = 0;
struct dvb_frontend_info grundig_29504_401_info = {
- name: "Grundig 29504-401",
- type: FE_OFDM,
-/* frequency_min: ???,*/
-/* frequency_max: ???,*/
- frequency_stepsize: 166666,
-/* frequency_tolerance: ???,*/
-/* symbol_rate_tolerance: ???,*/
- notifier_delay: 0,
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .name = "Grundig 29504-401",
+ .type = FE_OFDM,
+/* .frequency_min = ???,*/
+/* .frequency_max = ???,*/
+ .frequency_stepsize = 166666,
+/* .frequency_tolerance = ???,*/
+/* .symbol_rate_tolerance = ???,*/
+ .notifier_delay = 0,
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
FE_CAN_MUTE_TS /*| FE_CAN_CLEAN_SETUP*/
diff -puN drivers/media/dvb/frontends/ves1820.c~c99-conversions drivers/media/dvb/frontends/ves1820.c
--- 25/drivers/media/dvb/frontends/ves1820.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/media/dvb/frontends/ves1820.c 2003-08-25 02:59:04.000000000 -0700
@@ -81,9 +81,9 @@ static struct dvb_frontend_info ves1820_
.symbol_rate_min = (XIN/2)/64, /* SACLK/64 == (XIN/2)/64 */
.symbol_rate_max = (XIN/2)/4, /* SACLK/4 */
#if 0
- frequency_tolerance: ???,
- symbol_rate_tolerance: ???, /* ppm */ /* == 8% (spec p. 5) */
- notifier_delay: ?,
+ .frequency_tolerance = ???,
+ .symbol_rate_tolerance = ???, /* ppm */ /* == 8% (spec p. 5) */
+ .notifier_delay = ?,
#endif
.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |
FE_CAN_QAM_128 | FE_CAN_QAM_256 |
diff -puN drivers/media/dvb/ttusb-dec/dec2000_frontend.c~c99-conversions drivers/media/dvb/ttusb-dec/dec2000_frontend.c
--- 25/drivers/media/dvb/ttusb-dec/dec2000_frontend.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/media/dvb/ttusb-dec/dec2000_frontend.c 2003-08-25 02:59:04.000000000 -0700
@@ -30,12 +30,12 @@ static int debug = 0;
#define dprintk if (debug) printk
static struct dvb_frontend_info dec2000_frontend_info = {
- name: "TechnoTrend/Hauppauge DEC-2000-t Frontend",
- type: FE_OFDM,
- frequency_min: 51000000,
- frequency_max: 858000000,
- frequency_stepsize: 62500,
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .name = "TechnoTrend/Hauppauge DEC-2000-t Frontend",
+ .type = FE_OFDM,
+ .frequency_min = 51000000,
+ .frequency_max = 858000000,
+ .frequency_stepsize = 62500,
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
diff -puN drivers/media/dvb/ttusb-dec/ttusb_dec.c~c99-conversions drivers/media/dvb/ttusb-dec/ttusb_dec.c
--- 25/drivers/media/dvb/ttusb-dec/ttusb_dec.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2003-08-25 02:59:04.000000000 -0700
@@ -1003,10 +1003,10 @@ static struct usb_device_id ttusb_dec_ta
};
static struct usb_driver ttusb_dec_driver = {
- name: DRIVER_NAME,
- probe: ttusb_dec_probe,
- disconnect: ttusb_dec_disconnect,
- id_table: ttusb_dec_table,
+ .name = DRIVER_NAME,
+ .probe = ttusb_dec_probe,
+ .disconnect = ttusb_dec_disconnect,
+ .id_table = ttusb_dec_table,
};
static int __init ttusb_dec_init(void)
diff -puN drivers/mtd/maps/ceiva.c~c99-conversions drivers/mtd/maps/ceiva.c
--- 25/drivers/mtd/maps/ceiva.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/mtd/maps/ceiva.c 2003-08-25 02:59:04.000000000 -0700
@@ -64,23 +64,23 @@
static struct mtd_partition ceiva_partitions[] = {
{
- name: "Ceiva BOOT partition",
- size: BOOT_PARTITION_SIZE_KiB*1024,
- offset: 0,
+ .name = "Ceiva BOOT partition",
+ .size = BOOT_PARTITION_SIZE_KiB*1024,
+ .offset = 0,
},{
- name: "Ceiva parameters partition",
- size: PARAMS_PARTITION_SIZE_KiB*1024,
- offset: (16 + 8) * 1024,
+ .name = "Ceiva parameters partition",
+ .size = PARAMS_PARTITION_SIZE_KiB*1024,
+ .offset = (16 + 8) * 1024,
},{
- name: "Ceiva kernel partition",
- size: (KERNEL_PARTITION_SIZE_KiB)*1024,
- offset: 0x20000,
+ .name = "Ceiva kernel partition",
+ .size = (KERNEL_PARTITION_SIZE_KiB)*1024,
+ .offset = 0x20000,
},{
- name: "Ceiva root filesystem partition",
- offset: MTDPART_OFS_APPEND,
- size: (ROOT_PARTITION_SIZE_KiB)*1024,
+ .name = "Ceiva root filesystem partition",
+ .offset = MTDPART_OFS_APPEND,
+ .size = (ROOT_PARTITION_SIZE_KiB)*1024,
}
};
#endif
diff -puN drivers/mtd/nand/autcpu12.c~c99-conversions drivers/mtd/nand/autcpu12.c
--- 25/drivers/mtd/nand/autcpu12.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/mtd/nand/autcpu12.c 2003-08-25 02:59:04.000000000 -0700
@@ -73,39 +73,39 @@ __setup("autcpu12_pedr=",autcpu12_pedr);
extern struct nand_oobinfo jffs2_oobinfo;
static struct mtd_partition partition_info16k[] = {
- { name: "AUTCPU12 flash partition 1",
- offset: 0,
- size: 8 * SZ_1M },
- { name: "AUTCPU12 flash partition 2",
- offset: 8 * SZ_1M,
- size: 8 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 1",
+ .offset = 0,
+ .size = 8 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 2",
+ .offset = 8 * SZ_1M,
+ .size = 8 * SZ_1M },
};
static struct mtd_partition partition_info32k[] = {
- { name: "AUTCPU12 flash partition 1",
- offset: 0,
- size: 8 * SZ_1M },
- { name: "AUTCPU12 flash partition 2",
- offset: 8 * SZ_1M,
- size: 24 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 1",
+ .offset = 0,
+ .size = 8 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 2",
+ .offset = 8 * SZ_1M,
+ .size = 24 * SZ_1M },
};
static struct mtd_partition partition_info64k[] = {
- { name: "AUTCPU12 flash partition 1",
- offset: 0,
- size: 16 * SZ_1M },
- { name: "AUTCPU12 flash partition 2",
- offset: 16 * SZ_1M,
- size: 48 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 1",
+ .offset = 0,
+ .size = 16 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 2",
+ .offset = 16 * SZ_1M,
+ .size = 48 * SZ_1M },
};
static struct mtd_partition partition_info128k[] = {
- { name: "AUTCPU12 flash partition 1",
- offset: 0,
- size: 16 * SZ_1M },
- { name: "AUTCPU12 flash partition 2",
- offset: 16 * SZ_1M,
- size: 112 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 1",
+ .offset = 0,
+ .size = 16 * SZ_1M },
+ { .name = "AUTCPU12 flash partition 2",
+ .offset = 16 * SZ_1M,
+ .size = 112 * SZ_1M },
};
#define NUM_PARTITIONS16K 2
diff -puN drivers/mtd/nand/edb7312.c~c99-conversions drivers/mtd/nand/edb7312.c
--- 25/drivers/mtd/nand/edb7312.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/mtd/nand/edb7312.c 2003-08-25 02:59:04.000000000 -0700
@@ -71,9 +71,9 @@ __setup("ep7312_pxddr=",ep7312_pxddr);
* Define static partitions for flash device
*/
static struct mtd_partition partition_info[] = {
- { name: "EP7312 Nand Flash",
- offset: 0,
- size: 8*1024*1024 }
+ { .name = "EP7312 Nand Flash",
+ .offset = 0,
+ .size = 8*1024*1024 }
};
#define NUM_PARTITIONS 1
diff -puN drivers/net/arm/ether00.c~c99-conversions drivers/net/arm/ether00.c
--- 25/drivers/net/arm/ether00.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/net/arm/ether00.c 2003-08-25 02:59:04.000000000 -0700
@@ -991,9 +991,9 @@ static int ether00_remove_devices(void)
}
static struct pld_hotswap_ops ether00_pldhs_ops={
- name: ETHER00_NAME,
- add_device: ether00_add_device,
- remove_devices: ether00_remove_devices,
+ .name = ETHER00_NAME,
+ .add_device = ether00_add_device,
+ .remove_devices = ether00_remove_devices,
};
diff -puN drivers/net/irda/via-ircc.c~c99-conversions drivers/net/irda/via-ircc.c
--- 25/drivers/net/irda/via-ircc.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/net/irda/via-ircc.c 2003-08-25 02:59:04.000000000 -0700
@@ -134,10 +134,10 @@ MODULE_DEVICE_TABLE(pci,via_pci_tbl);
static struct pci_driver via_driver = {
- name: VIA_MODULE_NAME,
- id_table: via_pci_tbl,
- probe: via_init_one,
- remove: via_remove_one,
+ .name = VIA_MODULE_NAME,
+ .id_table = via_pci_tbl,
+ .probe = via_init_one,
+ .remove = via_remove_one,
};
diff -puN drivers/net/sungem_phy.c~c99-conversions drivers/net/sungem_phy.c
--- 25/drivers/net/sungem_phy.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/net/sungem_phy.c 2003-08-25 02:59:04.000000000 -0700
@@ -634,116 +634,116 @@ static int genmii_read_link(struct mii_p
/* Broadcom BCM 5201 */
static struct mii_phy_ops bcm5201_phy_ops = {
- init: bcm5201_init,
- suspend: bcm5201_suspend,
- setup_aneg: genmii_setup_aneg,
- setup_forced: genmii_setup_forced,
- poll_link: genmii_poll_link,
- read_link: genmii_read_link,
+ .init = bcm5201_init,
+ .suspend = bcm5201_suspend,
+ .setup_aneg = genmii_setup_aneg,
+ .setup_forced = genmii_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = genmii_read_link,
};
static struct mii_phy_def bcm5201_phy_def = {
- phy_id: 0x00406210,
- phy_id_mask: 0xfffffff0,
- name: "BCM5201",
- features: MII_BASIC_FEATURES,
- magic_aneg: 0,
- ops: &bcm5201_phy_ops
+ .phy_id = 0x00406210,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5201",
+ .features = MII_BASIC_FEATURES,
+ .magic_aneg = 0,
+ .ops = &bcm5201_phy_ops
};
/* Broadcom BCM 5221 */
static struct mii_phy_ops bcm5221_phy_ops = {
- suspend: bcm5201_suspend,
- init: bcm5221_init,
- setup_aneg: genmii_setup_aneg,
- setup_forced: genmii_setup_forced,
- poll_link: genmii_poll_link,
- read_link: genmii_read_link,
+ .suspend = bcm5201_suspend,
+ .init = bcm5221_init,
+ .setup_aneg = genmii_setup_aneg,
+ .setup_forced = genmii_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = genmii_read_link,
};
static struct mii_phy_def bcm5221_phy_def = {
- phy_id: 0x004061e0,
- phy_id_mask: 0xfffffff0,
- name: "BCM5221",
- features: MII_BASIC_FEATURES,
- magic_aneg: 0,
- ops: &bcm5221_phy_ops
+ .phy_id = 0x004061e0,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5221",
+ .features = MII_BASIC_FEATURES,
+ .magic_aneg = 0,
+ .ops = &bcm5221_phy_ops
};
/* Broadcom BCM 5400 */
static struct mii_phy_ops bcm5400_phy_ops = {
- init: bcm5400_init,
- suspend: bcm5400_suspend,
- setup_aneg: bcm54xx_setup_aneg,
- setup_forced: bcm54xx_setup_forced,
- poll_link: genmii_poll_link,
- read_link: bcm54xx_read_link,
+ .init = bcm5400_init,
+ .suspend = bcm5400_suspend,
+ .setup_aneg = bcm54xx_setup_aneg,
+ .setup_forced = bcm54xx_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = bcm54xx_read_link,
};
static struct mii_phy_def bcm5400_phy_def = {
- phy_id: 0x00206040,
- phy_id_mask: 0xfffffff0,
- name: "BCM5400",
- features: MII_GBIT_FEATURES,
- magic_aneg: 1,
- ops: &bcm5400_phy_ops
+ .phy_id = 0x00206040,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5400",
+ .features = MII_GBIT_FEATURES,
+ .magic_aneg = 1,
+ .ops = &bcm5400_phy_ops
};
/* Broadcom BCM 5401 */
static struct mii_phy_ops bcm5401_phy_ops = {
- init: bcm5401_init,
- suspend: bcm5401_suspend,
- setup_aneg: bcm54xx_setup_aneg,
- setup_forced: bcm54xx_setup_forced,
- poll_link: genmii_poll_link,
- read_link: bcm54xx_read_link,
+ .init = bcm5401_init,
+ .suspend = bcm5401_suspend,
+ .setup_aneg = bcm54xx_setup_aneg,
+ .setup_forced = bcm54xx_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = bcm54xx_read_link,
};
static struct mii_phy_def bcm5401_phy_def = {
- phy_id: 0x00206050,
- phy_id_mask: 0xfffffff0,
- name: "BCM5401",
- features: MII_GBIT_FEATURES,
- magic_aneg: 1,
- ops: &bcm5401_phy_ops
+ .phy_id = 0x00206050,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5401",
+ .features = MII_GBIT_FEATURES,
+ .magic_aneg = 1,
+ .ops = &bcm5401_phy_ops
};
/* Broadcom BCM 5411 */
static struct mii_phy_ops bcm5411_phy_ops = {
- init: bcm5411_init,
- suspend: bcm5411_suspend,
- setup_aneg: bcm54xx_setup_aneg,
- setup_forced: bcm54xx_setup_forced,
- poll_link: genmii_poll_link,
- read_link: bcm54xx_read_link,
+ .init = bcm5411_init,
+ .suspend = bcm5411_suspend,
+ .setup_aneg = bcm54xx_setup_aneg,
+ .setup_forced = bcm54xx_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = bcm54xx_read_link,
};
static struct mii_phy_def bcm5411_phy_def = {
- phy_id: 0x00206070,
- phy_id_mask: 0xfffffff0,
- name: "BCM5411",
- features: MII_GBIT_FEATURES,
- magic_aneg: 1,
- ops: &bcm5411_phy_ops
+ .phy_id = 0x00206070,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5411",
+ .features = MII_GBIT_FEATURES,
+ .magic_aneg = 1,
+ .ops = &bcm5411_phy_ops
};
/* Broadcom BCM 5421 */
static struct mii_phy_ops bcm5421_phy_ops = {
- init: bcm5421_init,
- suspend: bcm5411_suspend,
- setup_aneg: bcm54xx_setup_aneg,
- setup_forced: bcm54xx_setup_forced,
- poll_link: genmii_poll_link,
- read_link: bcm54xx_read_link,
+ .init = bcm5421_init,
+ .suspend = bcm5411_suspend,
+ .setup_aneg = bcm54xx_setup_aneg,
+ .setup_forced = bcm54xx_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = bcm54xx_read_link,
};
static struct mii_phy_def bcm5421_phy_def = {
- phy_id: 0x002060e0,
- phy_id_mask: 0xfffffff0,
- name: "BCM5421",
- features: MII_GBIT_FEATURES,
- magic_aneg: 1,
- ops: &bcm5421_phy_ops
+ .phy_id = 0x002060e0,
+ .phy_id_mask = 0xfffffff0,
+ .name = "BCM5421",
+ .features = MII_GBIT_FEATURES,
+ .magic_aneg = 1,
+ .ops = &bcm5421_phy_ops
};
/* Marvell 88E1101 (Apple seem to deal with 2 different revs,
@@ -751,36 +751,36 @@ static struct mii_phy_def bcm5421_phy_de
* would be useful here) --BenH.
*/
static struct mii_phy_ops marvell_phy_ops = {
- setup_aneg: marvell_setup_aneg,
- setup_forced: marvell_setup_forced,
- poll_link: genmii_poll_link,
- read_link: marvell_read_link
+ .setup_aneg = marvell_setup_aneg,
+ .setup_forced = marvell_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = marvell_read_link
};
static struct mii_phy_def marvell_phy_def = {
- phy_id: 0x01410c00,
- phy_id_mask: 0xffffff00,
- name: "Marvell 88E1101",
- features: MII_GBIT_FEATURES,
- magic_aneg: 1,
- ops: &marvell_phy_ops
+ .phy_id = 0x01410c00,
+ .phy_id_mask = 0xffffff00,
+ .name = "Marvell 88E1101",
+ .features = MII_GBIT_FEATURES,
+ .magic_aneg = 1,
+ .ops = &marvell_phy_ops
};
/* Generic implementation for most 10/100 PHYs */
static struct mii_phy_ops generic_phy_ops = {
- setup_aneg: genmii_setup_aneg,
- setup_forced: genmii_setup_forced,
- poll_link: genmii_poll_link,
- read_link: genmii_read_link
+ .setup_aneg = genmii_setup_aneg,
+ .setup_forced = genmii_setup_forced,
+ .poll_link = genmii_poll_link,
+ .read_link = genmii_read_link
};
static struct mii_phy_def genmii_phy_def = {
- phy_id: 0x00000000,
- phy_id_mask: 0x00000000,
- name: "Generic MII",
- features: MII_BASIC_FEATURES,
- magic_aneg: 0,
- ops: &generic_phy_ops
+ .phy_id = 0x00000000,
+ .phy_id_mask = 0x00000000,
+ .name = "Generic MII",
+ .features = MII_BASIC_FEATURES,
+ .magic_aneg = 0,
+ .ops = &generic_phy_ops
};
static struct mii_phy_def* mii_phy_table[] = {
diff -puN drivers/s390/net/qeth.c~c99-conversions drivers/s390/net/qeth.c
--- 25/drivers/s390/net/qeth.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/s390/net/qeth.c 2003-08-25 02:59:04.000000000 -0700
@@ -9765,19 +9765,19 @@ qeth_procfile_ioctl(struct inode *inode,
};
static struct file_operations qeth_procfile_fops = {
- ioctl:qeth_procfile_ioctl,
- read:qeth_procfile_read,
- open:qeth_procfile_open,
- release:qeth_procfile_release,
+ .ioctl = qeth_procfile_ioctl,
+ .read = qeth_procfile_read,
+ .open = qeth_procfile_open,
+ .release = qeth_procfile_release,
};
static struct proc_dir_entry *qeth_proc_file;
static struct file_operations qeth_ipato_procfile_fops = {
- read:qeth_procfile_read, /* same as above! */
- write:qeth_ipato_procfile_write,
- open:qeth_ipato_procfile_open,
- release:qeth_procfile_release /* same as above! */
+ .read = qeth_procfile_read, /* same as above! */
+ .write = qeth_ipato_procfile_write,
+ .open = qeth_ipato_procfile_open,
+ .release = qeth_procfile_release /* same as above! */
};
static struct proc_dir_entry *qeth_ipato_proc_file;
diff -puN drivers/scsi/aic7xxx/aic79xx_osm_pci.c~c99-conversions drivers/scsi/aic7xxx/aic79xx_osm_pci.c
--- 25/drivers/scsi/aic7xxx/aic79xx_osm_pci.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm_pci.c 2003-08-25 02:59:04.000000000 -0700
@@ -72,10 +72,10 @@ static struct pci_device_id ahd_linux_pc
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
struct pci_driver aic79xx_pci_driver = {
- name: "aic79xx",
- probe: ahd_linux_pci_dev_probe,
- remove: ahd_linux_pci_dev_remove,
- id_table: ahd_linux_pci_id_table
+ .name = "aic79xx",
+ .probe = ahd_linux_pci_dev_probe,
+ .remove = ahd_linux_pci_dev_remove,
+ .id_table = ahd_linux_pci_id_table
};
static void
diff -puN drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~c99-conversions drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- 25/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2003-08-25 02:59:04.000000000 -0700
@@ -75,10 +75,10 @@ static struct pci_device_id ahc_linux_pc
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
struct pci_driver aic7xxx_pci_driver = {
- name: "aic7xxx",
- probe: ahc_linux_pci_dev_probe,
- remove: ahc_linux_pci_dev_remove,
- id_table: ahc_linux_pci_id_table
+ .name = "aic7xxx",
+ .probe = ahc_linux_pci_dev_probe,
+ .remove = ahc_linux_pci_dev_remove,
+ .id_table = ahc_linux_pci_id_table
};
static void
diff -puN drivers/scsi/nsp32.c~c99-conversions drivers/scsi/nsp32.c
--- 25/drivers/scsi/nsp32.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/scsi/nsp32.c 2003-08-25 02:59:04.000000000 -0700
@@ -2809,13 +2809,13 @@ static int nsp32_detect(Scsi_Host_Templa
for (j = 0; j < NUMBER(data->lunt[0]); j++) {
int offset = i * NUMBER(data->lunt[0]) + j;
nsp32_lunt tmp = {
- SCpnt: NULL,
- save_datp: 0,
- msgin03: FALSE,
- sg_num: 0,
- cur_entry: 0,
- sglun: &(data->sg_list[offset]),
- sglun_paddr: data->sg_paddr + (offset * sizeof(nsp32_sglun)),
+ .SCpnt = NULL,
+ .save_datp = 0,
+ .msgin03 = FALSE,
+ .sg_num = 0,
+ .cur_entry = 0,
+ .sglun = &(data->sg_list[offset]),
+ .sglun_paddr = data->sg_paddr + (offset * sizeof(nsp32_sglun)),
};
data->lunt[i][j] = tmp;
diff -puN drivers/video/68328fb.c~c99-conversions drivers/video/68328fb.c
--- 25/drivers/video/68328fb.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/video/68328fb.c 2003-08-25 02:59:04.000000000 -0700
@@ -401,12 +401,12 @@ static struct fb_cmap *get_default_color
((1<<(width))-1)) : 0))
static struct fb_ops mc68328_fb_ops = {
- .owner: THIS_MODULE,
- .fb_setcolreg: mc68328fb_setcolreg,
- .fb_fillrect: cfbfillrect,
- .fb_copyarea: cfbcopyarea,
- .fb_imageblit: cfbimgblt,
- .fb_cursor: softcursor,
+ .owner = THIS_MODULE,
+ .fb_setcolreg = mc68328fb_setcolreg,
+ .fb_fillrect = cfbfillrect,
+ .fb_copyarea = cfbcopyarea,
+ .fb_imageblit = cfbimgblt,
+ .fb_cursor = softcursor,
};
diff -puN drivers/video/riva/fbdev.c~c99-conversions drivers/video/riva/fbdev.c
--- 25/drivers/video/riva/fbdev.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/drivers/video/riva/fbdev.c 2003-08-25 02:59:04.000000000 -0700
@@ -337,34 +337,34 @@ static char *mode_option __initdata = NU
#endif
static struct fb_fix_screeninfo rivafb_fix = {
- id: "nVidia",
- type: FB_TYPE_PACKED_PIXELS,
- xpanstep: 1,
- ypanstep: 1,
+ .id = "nVidia",
+ .type = FB_TYPE_PACKED_PIXELS,
+ .xpanstep = 1,
+ .ypanstep = 1,
};
static struct fb_var_screeninfo rivafb_default_var = {
- xres: 640,
- yres: 480,
- xres_virtual: 640,
- yres_virtual: 480,
- bits_per_pixel: 8,
- red: {0, 8, 0},
- green: {0, 8, 0},
- blue: {0, 8, 0},
- transp: {0, 0, 0},
- activate: FB_ACTIVATE_NOW,
- height: -1,
- width: -1,
- accel_flags: FB_ACCELF_TEXT,
- pixclock: 39721,
- left_margin: 40,
- right_margin: 24,
- upper_margin: 32,
- lower_margin: 11,
- hsync_len: 96,
- vsync_len: 2,
- vmode: FB_VMODE_NONINTERLACED
+ .xres = 640,
+ .yres = 480,
+ .xres_virtual = 640,
+ .yres_virtual = 480,
+ .bits_per_pixel = 8,
+ .red = {0, 8, 0},
+ .green = {0, 8, 0},
+ .blue = {0, 8, 0},
+ .transp = {0, 0, 0},
+ .activate = FB_ACTIVATE_NOW,
+ .height = -1,
+ .width = -1,
+ .accel_flags = FB_ACCELF_TEXT,
+ .pixclock = 39721,
+ .left_margin = 40,
+ .right_margin = 24,
+ .upper_margin = 32,
+ .lower_margin = 11,
+ .hsync_len = 96,
+ .vsync_len = 2,
+ .vmode = FB_VMODE_NONINTERLACED
};
/* from GGI */
@@ -2016,10 +2016,10 @@ int __init rivafb_setup(char *options)
#endif /* !MODULE */
static struct pci_driver rivafb_driver = {
- name: "rivafb",
- id_table: rivafb_pci_tbl,
- probe: rivafb_probe,
- remove: __exit_p(rivafb_remove),
+ .name = "rivafb",
+ .id_table = rivafb_pci_tbl,
+ .probe = rivafb_probe,
+ .remove = __exit_p(rivafb_remove),
};
diff -puN fs/affs/file.c~c99-conversions fs/affs/file.c
--- 25/fs/affs/file.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/fs/affs/file.c 2003-08-25 02:59:04.000000000 -0700
@@ -793,8 +793,8 @@ out:
struct address_space_operations affs_aops_ofs = {
.readpage = affs_readpage_ofs,
- //writepage: affs_writepage_ofs,
- //sync_page: affs_sync_page_ofs,
+ //.writepage = affs_writepage_ofs,
+ //.sync_page = affs_sync_page_ofs,
.prepare_write = affs_prepare_write_ofs,
.commit_write = affs_commit_write_ofs
};
diff -puN fs/jffs2/wbuf.c~c99-conversions fs/jffs2/wbuf.c
--- 25/fs/jffs2/wbuf.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/fs/jffs2/wbuf.c 2003-08-25 02:59:04.000000000 -0700
@@ -37,8 +37,8 @@
#define NAND_JFFS2_OOB16_FSDALEN 8
struct nand_oobinfo jffs2_oobinfo = {
- useecc: 1,
- eccpos: {JFFS2_OOB_ECCPOS0, JFFS2_OOB_ECCPOS1, JFFS2_OOB_ECCPOS2, JFFS2_OOB_ECCPOS3, JFFS2_OOB_ECCPOS4, JFFS2_OOB_ECCPOS5}
+ .useecc = 1,
+ .eccpos = {JFFS2_OOB_ECCPOS0, JFFS2_OOB_ECCPOS1, JFFS2_OOB_ECCPOS2, JFFS2_OOB_ECCPOS3, JFFS2_OOB_ECCPOS4, JFFS2_OOB_ECCPOS5}
};
static inline void jffs2_refile_wbuf_blocks(struct jffs2_sb_info *c)
diff -puN include/asm-arm26/processor.h~c99-conversions include/asm-arm26/processor.h
--- 25/include/asm-arm26/processor.h~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/include/asm-arm26/processor.h 2003-08-25 02:59:04.000000000 -0700
@@ -51,7 +51,7 @@ extern uaccess_t uaccess_user, uaccess_k
uaccess_t *uaccess; /* User access functions*/
#define EXTRA_THREAD_STRUCT_INIT \
- uaccess: &uaccess_kernel,
+ .uaccess = &uaccess_kernel,
// FIXME?!!
diff -puN include/asm-arm26/xor.h~c99-conversions include/asm-arm26/xor.h
--- 25/include/asm-arm26/xor.h~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/include/asm-arm26/xor.h 2003-08-25 02:59:04.000000000 -0700
@@ -125,11 +125,11 @@ xor_arm4regs_5(unsigned long bytes, unsi
}
static struct xor_block_template xor_block_arm4regs = {
- name: "arm4regs",
- do_2: xor_arm4regs_2,
- do_3: xor_arm4regs_3,
- do_4: xor_arm4regs_4,
- do_5: xor_arm4regs_5,
+ .name = "arm4regs",
+ .do_2 = xor_arm4regs_2,
+ .do_3 = xor_arm4regs_3,
+ .do_4 = xor_arm4regs_4,
+ .do_5 = xor_arm4regs_5,
};
#undef XOR_TRY_TEMPLATES
diff -puN include/asm-arm/proc-armo/processor.h~c99-conversions include/asm-arm/proc-armo/processor.h
--- 25/include/asm-arm/proc-armo/processor.h~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/include/asm-arm/proc-armo/processor.h 2003-08-25 02:59:04.000000000 -0700
@@ -43,7 +43,7 @@ extern uaccess_t uaccess_user, uaccess_k
uaccess_t *uaccess; /* User access functions*/
#define EXTRA_THREAD_STRUCT_INIT \
- uaccess: &uaccess_kernel,
+ .uaccess = &uaccess_kernel,
#define start_thread(regs,pc,sp) \
({ \
diff -puN include/asm-arm/xor.h~c99-conversions include/asm-arm/xor.h
--- 25/include/asm-arm/xor.h~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/include/asm-arm/xor.h 2003-08-25 02:59:04.000000000 -0700
@@ -125,11 +125,11 @@ xor_arm4regs_5(unsigned long bytes, unsi
}
static struct xor_block_template xor_block_arm4regs = {
- name: "arm4regs",
- do_2: xor_arm4regs_2,
- do_3: xor_arm4regs_3,
- do_4: xor_arm4regs_4,
- do_5: xor_arm4regs_5,
+ .name = "arm4regs",
+ .do_2 = xor_arm4regs_2,
+ .do_3 = xor_arm4regs_3,
+ .do_4 = xor_arm4regs_4,
+ .do_5 = xor_arm4regs_5,
};
#undef XOR_TRY_TEMPLATES
diff -puN scripts/kconfig/symbol.c~c99-conversions scripts/kconfig/symbol.c
--- 25/scripts/kconfig/symbol.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/scripts/kconfig/symbol.c 2003-08-25 02:59:04.000000000 -0700
@@ -12,21 +12,21 @@
#include "lkc.h"
struct symbol symbol_yes = {
- name: "y",
- curr: { "y", yes },
- flags: SYMBOL_YES|SYMBOL_VALID,
+ .name = "y",
+ .curr = { "y", yes },
+ .flags = SYMBOL_YES|SYMBOL_VALID,
}, symbol_mod = {
- name: "m",
- curr: { "m", mod },
- flags: SYMBOL_MOD|SYMBOL_VALID,
+ .name = "m",
+ .curr = { "m", mod },
+ .flags = SYMBOL_MOD|SYMBOL_VALID,
}, symbol_no = {
- name: "n",
- curr: { "n", no },
- flags: SYMBOL_NO|SYMBOL_VALID,
+ .name = "n",
+ .curr = { "n", no },
+ .flags = SYMBOL_NO|SYMBOL_VALID,
}, symbol_empty = {
- name: "",
- curr: { "", no },
- flags: SYMBOL_VALID,
+ .name = "",
+ .curr = { "", no },
+ .flags = SYMBOL_VALID,
};
int sym_change_count;
diff -puN sound/oss/ite8172.c~c99-conversions sound/oss/ite8172.c
--- 25/sound/oss/ite8172.c~c99-conversions 2003-08-25 02:59:04.000000000 -0700
+++ 25-akpm/sound/oss/ite8172.c 2003-08-25 02:59:04.000000000 -0700
@@ -2198,10 +2198,10 @@ static struct pci_device_id id_table[] =
MODULE_DEVICE_TABLE(pci, id_table);
static struct pci_driver it8172_driver = {
- name: IT8172_MODULE_NAME,
- id_table: id_table,
- probe: it8172_probe,
- remove: it8172_remove
+ .name = IT8172_MODULE_NAME,
+ .id_table = id_table,
+ .probe = it8172_probe,
+ .remove = it8172_remove
};
static int __init init_it8172(void)
_