CVSROOT: /home/cvs
Module name: linux
Changes by: ralf@ftp.linux-mips.org 05/02/28 13:35:57
Modified files:
arch/mips/au1000/db1x00: mirage_ts.c
drivers/char : au1000_gpio.c au1000_ts.c au1000_usbraw.c
au1000_usbtty.c sb1250_duart.c serial_txx9.c
serial_txx927.c
drivers/pcmcia : au1000_generic.h
drivers/video : au1100fb.c epson1356fb.c
include/asm-mips: serial.h
Log message:
Use bloody ISO ininitializers, damnit.
diff -urN linux/arch/mips/au1000/db1x00/mirage_ts.c
linux/arch/mips/au1000/db1x00/mirage_ts.c
--- linux/arch/mips/au1000/db1x00/mirage_ts.c 2005/01/27 00:33:38 1.4
+++ linux/arch/mips/au1000/db1x00/mirage_ts.c 2005/02/28 13:35:57 1.5
@@ -102,15 +102,15 @@
} mirage_ts_cal =
{
#if 0
- xscale: 84,
- xtrans: -157,
- yscale: 66,
- ytrans: -150,
+ .xscale = 84,
+ .xtrans = -157,
+ .yscale = 66,
+ .ytrans = -150,
#else
- xscale: 84,
- xtrans: -150,
- yscale: 66,
- ytrans: -146,
+ .xscale = 84,
+ .xtrans = -150,
+ .yscale = 66,
+ .ytrans = -146,
#endif
};
diff -urN linux/drivers/char/au1000_gpio.c linux/drivers/char/au1000_gpio.c
--- linux/drivers/char/au1000_gpio.c 2004/10/26 02:17:37 1.5
+++ linux/drivers/char/au1000_gpio.c 2005/02/28 13:35:57 1.6
@@ -233,10 +233,10 @@
static struct file_operations au1000gpio_fops =
{
- owner: THIS_MODULE,
- ioctl: au1000gpio_ioctl,
- open: au1000gpio_open,
- release: au1000gpio_release,
+ .owner = THIS_MODULE,
+ .ioctl = au1000gpio_ioctl,
+ .open = au1000gpio_open,
+ .release = au1000gpio_release,
};
diff -urN linux/drivers/char/au1000_ts.c linux/drivers/char/au1000_ts.c
--- linux/drivers/char/au1000_ts.c 2004/10/26 02:17:37 1.2
+++ linux/drivers/char/au1000_ts.c 2005/02/28 13:35:57 1.3
@@ -587,12 +587,12 @@
static struct file_operations ts_fops = {
- read: au1000_read,
- poll: au1000_poll,
- ioctl: au1000_ioctl,
- fasync: au1000_fasync,
- open: au1000_open,
- release: au1000_release,
+ .read = au1000_read,
+ .poll = au1000_poll,
+ .ioctl = au1000_ioctl,
+ .fasync = au1000_fasync,
+ .open = au1000_open,
+ .release = au1000_release,
};
/* +++++++++++++ End File operations ++++++++++++++*/
diff -urN linux/drivers/char/au1000_usbraw.c linux/drivers/char/au1000_usbraw.c
--- linux/drivers/char/au1000_usbraw.c 2004/10/26 02:17:37 1.3
+++ linux/drivers/char/au1000_usbraw.c 2005/02/28 13:35:57 1.4
@@ -456,14 +456,14 @@
static struct file_operations usbraw_fops = {
- owner: THIS_MODULE,
- write: usbraw_write,
- read: usbraw_read,
- poll: usbraw_poll,
- ioctl: usbraw_ioctl,
- fasync: usbraw_fasync,
- open: usbraw_open,
- release: usbraw_release,
+ .owner = THIS_MODULE,
+ .write = usbraw_write,
+ .read = usbraw_read,
+ .poll = usbraw_poll,
+ .ioctl = usbraw_ioctl,
+ .fasync = usbraw_fasync,
+ .open = usbraw_open,
+ .release = usbraw_release,
};
void usbfn_raw_exit(void)
diff -urN linux/drivers/char/au1000_usbtty.c linux/drivers/char/au1000_usbtty.c
--- linux/drivers/char/au1000_usbtty.c 2004/10/26 02:17:37 1.3
+++ linux/drivers/char/au1000_usbtty.c 2005/02/28 13:35:57 1.4
@@ -610,30 +610,30 @@
static struct tty_driver serial_tty_driver = {
- magic:TTY_DRIVER_MAGIC,
- driver_name:"usbfn-tty",
- name:"usb/ttsdev/%d",
- major:SERIAL_TTY_MAJOR,
- minor_start:0,
- num:NUM_PORTS,
- type:TTY_DRIVER_TYPE_SERIAL,
- subtype:SERIAL_TYPE_NORMAL,
- flags:TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
- refcount:&serial_refcount,
- table:serial_tty,
- termios:serial_termios,
- termios_locked:serial_termios_locked,
+ .magic= TTY_DRIVER_MAGIC,
+ .driver_name= "usbfn-tty",
+ .name= "usb/ttsdev/%d",
+ .major= SERIAL_TTY_MAJOR,
+ .minor_start= 0,
+ .num= NUM_PORTS,
+ .type= TTY_DRIVER_TYPE_SERIAL,
+ .subtype= SERIAL_TYPE_NORMAL,
+ .flags= TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
+ .refcount= &serial_refcount,
+ .table= serial_tty,
+ .termios= serial_termios,
+ .termios_locked= serial_termios_locked,
- open:serial_open,
- close:serial_close,
- write:serial_write,
- write_room:serial_write_room,
- ioctl:serial_ioctl,
- set_termios:serial_set_termios,
- throttle:serial_throttle,
- unthrottle:serial_unthrottle,
- break_ctl:serial_break,
- chars_in_buffer:serial_chars_in_buffer,
+ .open= serial_open,
+ .close= serial_close,
+ .write= serial_write,
+ .write_room= serial_write_room,
+ .ioctl= serial_ioctl,
+ .set_termios= serial_set_termios,
+ .throttle= serial_throttle,
+ .unthrottle= serial_unthrottle,
+ .break_ctl= serial_break,
+ .chars_in_buffer= serial_chars_in_buffer,
};
diff -urN linux/drivers/char/sb1250_duart.c linux/drivers/char/sb1250_duart.c
--- linux/drivers/char/sb1250_duart.c 2005/02/22 21:51:50 1.32
+++ linux/drivers/char/sb1250_duart.c 2005/02/28 13:35:57 1.33
@@ -880,12 +880,12 @@
}
static struct console sb1250_ser_cons = {
- name: "duart",
- write: ser_console_write,
- device: ser_console_device,
- setup: ser_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = "duart",
+ .write = ser_console_write,
+ .device = ser_console_device,
+ .setup = ser_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
};
static int __init sb1250_serial_console_init(void)
diff -urN linux/drivers/char/serial_txx9.c linux/drivers/char/serial_txx9.c
--- linux/drivers/char/serial_txx9.c 2004/11/12 03:10:46 1.4
+++ linux/drivers/char/serial_txx9.c 2005/02/28 13:35:57 1.5
@@ -113,32 +113,32 @@
= {
/* NR_PORTS = 0 */
{base: 0xff1f0000 + 0xf300,
- irq: 36,
- baud_base: 40000000 / 16 / 2,
- io_type: -1, /* virtual memory mapped */
- flags: TXX9_SERIAL_HAVE_CTS_LINE,},
+ .irq = 36,
+ .baud_base = 40000000 / 16 / 2,
+ .io_type = -1, /* virtual memory mapped */
+ .flags = TXX9_SERIAL_HAVE_CTS_LINE,},
/* NR_PORTS = 1 */
{base: 0xff1f0000 + 0xf400,
- irq: 37,
- baud_base: 40000000 / 16 / 2,
- io_type: -1, /* virtual memory mapped */
- flags: TXX9_SERIAL_HAVE_CTS_LINE,}
+ .irq = 37,
+ .baud_base = 40000000 / 16 / 2,
+ .io_type = -1, /* virtual memory mapped */
+ .flags = TXX9_SERIAL_HAVE_CTS_LINE,}
};
#endif
#ifdef CONFIG_TOSHIBA_RBTX4927
= {
/* NR_PORTS = 0 */
{base: 0xff1f0000 + 0xf300,
- irq: 32,
- baud_base: 50000000 / 16 / 2,
- io_type: -1, /* virtual memory mapped */
- flags: TXX9_SERIAL_HAVE_CTS_LINE,},
+ .irq = 32,
+ .baud_base = 50000000 / 16 / 2,
+ .io_type = -1, /* virtual memory mapped */
+ .flags = TXX9_SERIAL_HAVE_CTS_LINE,},
/* NR_PORTS = 1 */
{base: 0xff1f0000 + 0xf400,
- irq: 33,
- baud_base: 50000000 / 16 / 2,
- io_type: -1, /* virtual memory mapped */
- flags: TXX9_SERIAL_HAVE_CTS_LINE,}
+ .irq = 33,
+ .baud_base = 50000000 / 16 / 2,
+ .io_type = -1, /* virtual memory mapped */
+ .flags = TXX9_SERIAL_HAVE_CTS_LINE,}
};
#endif
@@ -294,17 +294,17 @@
* Used by generic serial driver to access hardware
*/
static struct real_driver rs_real_driver = {
- disable_tx_interrupts: rs_disable_tx_interrupts,
- enable_tx_interrupts: rs_enable_tx_interrupts,
- disable_rx_interrupts: rs_disable_rx_interrupts,
- enable_rx_interrupts: rs_enable_rx_interrupts,
+ .disable_tx_interrupts = rs_disable_tx_interrupts,
+ .enable_tx_interrupts = rs_enable_tx_interrupts,
+ .disable_rx_interrupts = rs_disable_rx_interrupts,
+ .enable_rx_interrupts = rs_enable_rx_interrupts,
get_CD: rs_get_CD,
- shutdown_port: rs_shutdown_port,
- set_real_termios: rs_set_real_termios,
- chars_in_buffer: rs_chars_in_buffer,
- close: rs_close,
- hungup: rs_hungup,
- getserial: rs_getserial,
+ .shutdown_port = rs_shutdown_port,
+ .set_real_termios = rs_set_real_termios,
+ .chars_in_buffer = rs_chars_in_buffer,
+ .close = rs_close,
+ .hungup = rs_hungup,
+ .getserial = rs_getserial,
};
/*
@@ -1319,10 +1319,10 @@
MODULE_DEVICE_TABLE(pci, serial_txx9_pci_tbl);
static struct pci_driver serial_txx9_pci_driver = {
- name: "serial_txx9",
- probe: serial_txx9_init_one,
- remove: __devexit_p(serial_txx9_remove_one),
- id_table: serial_txx9_pci_tbl,
+ .name = "serial_txx9",
+ .probe = serial_txx9_init_one,
+ .remove = __devexit_p(serial_txx9_remove_one),
+ .id_table = serial_txx9_pci_tbl,
};
/*
@@ -1614,12 +1614,12 @@
}
static struct console sercons = {
- name: TXX9_TTY_NAME,
- write: serial_console_write,
- device: serial_console_device,
- setup: serial_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = TXX9_TTY_NAME,
+ .write = serial_console_write,
+ .device = serial_console_device,
+ .setup = serial_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
};
static int __init txx9_serial_console_init(void)
diff -urN linux/drivers/char/serial_txx927.c linux/drivers/char/serial_txx927.c
--- linux/drivers/char/serial_txx927.c 2002/10/28 04:39:20 1.3
+++ linux/drivers/char/serial_txx927.c 2005/02/28 13:35:57 1.4
@@ -2313,12 +2313,12 @@
}
static struct console sercons = {
- name: TXX927_TTY_NAME,
- write: serial_console_write,
- device: serial_console_device,
- setup: serial_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = TXX927_TTY_NAME,
+ .write = serial_console_write,
+ .device = serial_console_device,
+ .setup = serial_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
};
/*
diff -urN linux/drivers/pcmcia/au1000_generic.h
linux/drivers/pcmcia/au1000_generic.h
--- linux/drivers/pcmcia/au1000_generic.h 2004/10/19 07:26:37 1.4
+++ linux/drivers/pcmcia/au1000_generic.h 2005/02/28 13:35:57 1.5
@@ -61,8 +61,8 @@
struct pcmcia_state {
unsigned detect: 1,
- ready: 1,
- wrprot: 1,
+ .ready = 1,
+ .wrprot = 1,
bvd1: 1,
bvd2: 1,
vs_3v: 1,
@@ -71,11 +71,11 @@
struct pcmcia_configure {
unsigned sock: 8,
- vcc: 8,
- vpp: 8,
- output: 1,
- speaker: 1,
- reset: 1;
+ .vcc = 8,
+ .vpp = 8,
+ .output = 1,
+ .speaker = 1,
+ .reset = 1;
};
struct pcmcia_irqs {
diff -urN linux/drivers/video/au1100fb.c linux/drivers/video/au1100fb.c
--- linux/drivers/video/au1100fb.c 2004/10/26 02:23:08 1.3
+++ linux/drivers/video/au1100fb.c 2005/02/28 13:35:57 1.4
@@ -111,15 +111,15 @@
void au1100_nocursor(struct display *p, int mode, int xx, int yy){};
static struct fb_ops au1100fb_ops = {
- owner: THIS_MODULE,
- fb_get_fix: fbgen_get_fix,
- fb_get_var: fbgen_get_var,
- fb_set_var: fbgen_set_var,
- fb_get_cmap: fbgen_get_cmap,
- fb_set_cmap: fbgen_set_cmap,
- fb_pan_display: fbgen_pan_display,
- fb_ioctl: au1100fb_ioctl,
- fb_mmap: au1100fb_mmap,
+ .owner = THIS_MODULE,
+ .fb_get_fix = fbgen_get_fix,
+ .fb_get_var = fbgen_get_var,
+ .fb_set_var = fbgen_set_var,
+ .fb_get_cmap = fbgen_get_cmap,
+ .fb_set_cmap = fbgen_set_cmap,
+ .fb_pan_display = fbgen_pan_display,
+ .fb_ioctl = au1100fb_ioctl,
+ .fb_mmap = au1100fb_mmap,
};
static void au1100_detect(void)
diff -urN linux/drivers/video/epson1356fb.c linux/drivers/video/epson1356fb.c
--- linux/drivers/video/epson1356fb.c 2004/10/26 02:23:09 1.4
+++ linux/drivers/video/epson1356fb.c 2005/02/28 13:35:57 1.5
@@ -194,16 +194,16 @@
static int currcon = 0;
static struct fb_ops e1356fb_ops = {
- owner: THIS_MODULE,
- fb_open: e1356fb_open,
- fb_release: e1356fb_release,
- fb_get_fix: e1356fb_get_fix,
- fb_get_var: e1356fb_get_var,
- fb_set_var: e1356fb_set_var,
- fb_get_cmap: e1356fb_get_cmap,
- fb_set_cmap: e1356fb_set_cmap,
- fb_pan_display: e1356fb_pan_display,
- fb_mmap: e1356fb_mmap,
+ .owner = THIS_MODULE,
+ .fb_open = e1356fb_open,
+ .fb_release = e1356fb_release,
+ .fb_get_fix = e1356fb_get_fix,
+ .fb_get_var = e1356fb_get_var,
+ .fb_set_var = e1356fb_set_var,
+ .fb_get_cmap = e1356fb_get_cmap,
+ .fb_set_cmap = e1356fb_set_cmap,
+ .fb_pan_display = e1356fb_pan_display,
+ .fb_mmap = e1356fb_mmap,
};
#define PCI_VENDOR_ID_EPSON 0x10f4
@@ -1313,29 +1313,29 @@
#ifdef FBCON_HAS_CFB8
static struct display_switch fbcon_e1356_8 = {
- setup: fbcon_cfb8_setup,
- bmove: e1356_cfbX_bmove,
- clear: e1356_cfb8_clear,
- putc: e1356_cfb8_putc,
- putcs: e1356_cfb8_putcs,
- revc: e1356_cfbX_revc,
- cursor: e1356_cfbX_cursor,
- clear_margins: e1356_cfbX_clear_margins,
- fontwidthmask: FONTWIDTHRANGE(6,16)
+ .setup = fbcon_cfb8_setup,
+ .bmove = e1356_cfbX_bmove,
+ .clear = e1356_cfb8_clear,
+ .putc = e1356_cfb8_putc,
+ .putcs = e1356_cfb8_putcs,
+ .revc = e1356_cfbX_revc,
+ .cursor = e1356_cfbX_cursor,
+ .clear_margins = e1356_cfbX_clear_margins,
+ .fontwidthmask = FONTWIDTHRANGE(6,16)
};
#endif
#ifdef FBCON_HAS_CFB16
static struct display_switch fbcon_e1356_16 = {
- setup: fbcon_cfb16_setup,
- bmove: e1356_cfbX_bmove,
- clear: e1356_cfb16_clear,
- putc: e1356_cfb16_putc,
- putcs: e1356_cfb16_putcs,
- revc: e1356_cfbX_revc,
- cursor: e1356_cfbX_cursor,
- clear_margins: e1356_cfbX_clear_margins,
- fontwidthmask: FONTWIDTHRANGE(6,16)
+ .setup = fbcon_cfb16_setup,
+ .bmove = e1356_cfbX_bmove,
+ .clear = e1356_cfb16_clear,
+ .putc = e1356_cfb16_putc,
+ .putcs = e1356_cfb16_putcs,
+ .revc = e1356_cfbX_revc,
+ .cursor = e1356_cfbX_cursor,
+ .clear_margins = e1356_cfbX_clear_margins,
+ .fontwidthmask = FONTWIDTHRANGE(6,16)
};
#endif
diff -urN linux/include/asm-mips/serial.h linux/include/asm-mips/serial.h
--- linux/include/asm-mips/serial.h 2004/11/09 18:28:25 1.61
+++ linux/include/asm-mips/serial.h 2005/02/28 13:35:57 1.62
@@ -309,9 +309,9 @@
#define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L
#define _JAGUAR_ATX_SERIAL_INIT(int, base) \
- { baud_base: JAGUAR_ATX_BASE_BAUD, irq: int, \
- flags: (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: (u8 *) base, iomem_reg_shift: 2, \
+ { .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int, \
+ .flags = (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
+ .iomem_base = (u8 *) base, iomem_reg_shift: 2,
\
io_type: SERIAL_IO_MEM }
#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \
_JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
@@ -325,9 +325,9 @@
#define OCELOT_3_SERIAL_BASE (signed)0xfd000020
#define _OCELOT_3_SERIAL_INIT(int, base) \
- { baud_base: OCELOT_3_BASE_BAUD, irq: int, \
- flags: STD_COM_FLAGS, \
- iomem_base: (u8 *) base, iomem_reg_shift: 2, \
+ { .baud_base = OCELOT_3_BASE_BAUD, irq: int, \
+ .flags = STD_COM_FLAGS,
\
+ .iomem_base = (u8 *) base, iomem_reg_shift: 2,
\
io_type: SERIAL_IO_MEM }
#define MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \
|