From 4900a2800e88a60d6bf0f91eb4be72dfbb140fea Mon Sep 17 00:00:00 2001 From: Art Haas Date: Sun, 17 Nov 2002 18:11:25 -0800 Subject: [PATCH] C99 initializers for drivers/s390 --- drivers/s390/block/dasd_diag.c | 26 ++++++++++---------- drivers/s390/block/dasd_eckd.c | 56 +++++++++++++++++++++--------------------- drivers/s390/block/dasd_fba.c | 42 +++++++++++++++---------------- drivers/s390/block/dasd_proc.c | 20 +++++++-------- drivers/s390/char/con3215.c | 12 ++++----- drivers/s390/char/hwc_con.c | 10 ++++---- drivers/s390/char/tape.c | 8 +++--- drivers/s390/char/tapechar.c | 12 ++++----- drivers/s390/char/tubfs.c | 12 ++++----- drivers/s390/cio/chsc.c | 20 +++++++-------- drivers/s390/cio/proc.c | 6 ++--- drivers/s390/net/ctcmain.c | 16 ++++++------ drivers/s390/net/netiucv.c | 38 ++++++++++++++-------------- 13 files changed, 139 insertions(+), 139 deletions(-) diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c index e2e9779a8698..cbf8818e316b 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c @@ -464,19 +464,19 @@ dasd_diag_dump_sense(dasd_device_t *device, dasd_ccw_req_t * req) * for one request. Give a little safety and the result is 240. */ static dasd_discipline_t dasd_diag_discipline = { - owner:THIS_MODULE, - name:"DIAG", - ebcname:"DIAG", - max_blocks:240, - check_device:dasd_diag_check_device, - fill_geometry:dasd_diag_fill_geometry, - start_IO:dasd_start_diag, - examine_error:dasd_diag_examine_error, - erp_action:dasd_diag_erp_action, - erp_postaction:dasd_diag_erp_postaction, - build_cp:dasd_diag_build_cp, - dump_sense:dasd_diag_dump_sense, - fill_info:dasd_diag_fill_info, + .owner = THIS_MODULE, + .name = "DIAG", + .ebcname = "DIAG", + .max_blocks = 240, + .check_device = dasd_diag_check_device, + .fill_geometry = dasd_diag_fill_geometry, + .start_IO = dasd_start_diag, + .examine_error = dasd_diag_examine_error, + .erp_action = dasd_diag_erp_action, + .erp_postaction = dasd_diag_erp_postaction, + .build_cp = dasd_diag_build_cp, + .dump_sense = dasd_diag_dump_sense, + .fill_info = dasd_diag_fill_info, }; int diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index a37bf0cb0dc8..64e59fb1bc78 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -73,25 +73,25 @@ typedef struct dasd_eckd_private_t { static devreg_t dasd_eckd_known_devices[] = { { - ci: { hc: { ctype: 0x3880, dtype:3390 } }, - flag:(DEVREG_MATCH_CU_TYPE | DEVREG_MATCH_DEV_TYPE | + .ci = { .hc = { .ctype = 0x3880, .dtype = 3390 } }, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_MATCH_DEV_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .oper_func = dasd_oper_handler }, { - ci: { hc: { ctype:0x3990 } }, - flag:(DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .ci = { .hc = { .ctype = 0x3990 } }, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), + .oper_func = dasd_oper_handler }, { - ci: { hc: { ctype:0x2105 } }, - flag:(DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .ci = { .hc = { .ctype = 0x2105 } }, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), + .oper_func = dasd_oper_handler }, { - ci: { hc: { ctype:0x9343 } }, - flag:(DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .ci = { .hc = { .ctype = 0x9343 } }, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_TYPE_DEVCHARS), + .oper_func = dasd_oper_handler } }; @@ -1418,22 +1418,22 @@ dasd_eckd_dump_sense(struct dasd_device_t *device, dasd_ccw_req_t * req) * for one request. Give a little safety and the result is 240. */ static dasd_discipline_t dasd_eckd_discipline = { - owner:THIS_MODULE, - name:"ECKD", - ebcname:"ECKD", - max_blocks:240, - check_device:dasd_eckd_check_device, - do_analysis:dasd_eckd_do_analysis, - fill_geometry:dasd_eckd_fill_geometry, - start_IO:dasd_start_IO, - term_IO:dasd_term_IO, - format_device:dasd_eckd_format_device, - examine_error:dasd_eckd_examine_error, - erp_action:dasd_eckd_erp_action, - erp_postaction:dasd_eckd_erp_postaction, - build_cp:dasd_eckd_build_cp, - dump_sense:dasd_eckd_dump_sense, - fill_info:dasd_eckd_fill_info, + .owner = THIS_MODULE, + .name = "ECKD", + .ebcname = "ECKD", + .max_blocks = 240, + .check_device = dasd_eckd_check_device, + .do_analysis = dasd_eckd_do_analysis, + .fill_geometry = dasd_eckd_fill_geometry, + .start_IO = dasd_start_IO, + .term_IO = dasd_term_IO, + .format_device = dasd_eckd_format_device, + .examine_error = dasd_eckd_examine_error, + .erp_action = dasd_eckd_erp_action, + .erp_postaction = dasd_eckd_erp_postaction, + .build_cp = dasd_eckd_build_cp, + .dump_sense = dasd_eckd_dump_sense, + .fill_info = dasd_eckd_fill_info, }; int diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index 68c21776104e..419eff8f941b 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c @@ -47,16 +47,16 @@ typedef struct dasd_fba_private_t { static devreg_t dasd_fba_known_devices[] = { { - ci: {hc: {ctype: 0x6310, dtype:0x9336}}, - flag:(DEVREG_MATCH_CU_TYPE | + .ci = {.hc = {.ctype = 0x6310, .dtype = 0x9336}}, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_MATCH_DEV_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .oper_func = dasd_oper_handler }, { - ci: {hc: {ctype: 0x3880, dtype:0x3370}}, - flag:(DEVREG_MATCH_CU_TYPE | + .ci = {.hc = {.ctype = 0x3880, .dtype = 0x3370}}, + .flag = (DEVREG_MATCH_CU_TYPE | DEVREG_MATCH_DEV_TYPE | DEVREG_TYPE_DEVCHARS), - oper_func:dasd_oper_handler + .oper_func = dasd_oper_handler } }; @@ -392,21 +392,21 @@ dasd_fba_dump_sense(struct dasd_device_t *device, dasd_ccw_req_t * req) * for one request. Give a little safety and the result is 96. */ static dasd_discipline_t dasd_fba_discipline = { - owner:THIS_MODULE, - name:"FBA ", - ebcname:"FBA ", - max_blocks:96, - check_device:dasd_fba_check_device, - do_analysis:dasd_fba_do_analysis, - fill_geometry:dasd_fba_fill_geometry, - start_IO:dasd_start_IO, - term_IO:dasd_term_IO, - examine_error:dasd_fba_examine_error, - erp_action:dasd_fba_erp_action, - erp_postaction:dasd_fba_erp_postaction, - build_cp:dasd_fba_build_cp, - dump_sense:dasd_fba_dump_sense, - fill_info:dasd_fba_fill_info, + .owner = THIS_MODULE, + .name = "FBA ", + .ebcname = "FBA ", + .max_blocks = 96, + .check_device = dasd_fba_check_device, + .do_analysis = dasd_fba_do_analysis, + .fill_geometry = dasd_fba_fill_geometry, + .start_IO = dasd_start_IO, + .term_IO = dasd_term_IO, + .examine_error = dasd_fba_examine_error, + .erp_action = dasd_fba_erp_action, + .erp_postaction = dasd_fba_erp_postaction, + .build_cp = dasd_fba_build_cp, + .dump_sense = dasd_fba_dump_sense, + .fill_info = dasd_fba_fill_info, }; int diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index e7df396559bf..cc76c4bdbd36 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c @@ -262,11 +262,11 @@ dasd_devices_open(struct inode *inode, struct file *file) } static struct file_operations dasd_devices_file_ops = { - owner:THIS_MODULE, - read:dasd_generic_read, /* read */ - write:dasd_devices_write, /* write */ - open:dasd_devices_open, /* open */ - release:dasd_generic_close, /* close */ + .owner = THIS_MODULE, + .read = dasd_generic_read, /* read */ + .write = dasd_devices_write, /* write */ + .open = dasd_devices_open, /* open */ + .release = dasd_generic_close, /* close */ }; static struct inode_operations dasd_devices_inode_ops = { @@ -416,11 +416,11 @@ out_error: } static struct file_operations dasd_statistics_file_ops = { - owner: THIS_MODULE, - read: dasd_generic_read, /* read */ - write: dasd_statistics_write, /* write */ - open: dasd_statistics_open, /* open */ - release:dasd_generic_close, /* close */ + .owner = THIS_MODULE, + .read = dasd_generic_read, /* read */ + .write = dasd_statistics_write, /* write */ + .open = dasd_statistics_open, /* open */ + .release = dasd_generic_close, /* close */ }; static struct inode_operations dasd_statistics_inode_ops = { diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index f1b01baf31b0..1fa9b4d3f4e5 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -822,12 +822,12 @@ static int __init con3215_consetup(struct console *co, char *options) * The console structure for the 3215 console */ static struct console con3215 = { - name: "tty3215", - write: con3215_write, - device: con3215_device, - unblank: con3215_unblank, - setup: con3215_consetup, - flags: CON_PRINTBUFFER, + .name = "tty3215", + .write = con3215_write, + .device = con3215_device, + .unblank = con3215_unblank, + .setup = con3215_consetup, + .flags = CON_PRINTBUFFER, }; #endif diff --git a/drivers/s390/char/hwc_con.c b/drivers/s390/char/hwc_con.c index 86fb75ec27bf..535e2d2df6f1 100644 --- a/drivers/s390/char/hwc_con.c +++ b/drivers/s390/char/hwc_con.c @@ -34,11 +34,11 @@ void hwc_console_unblank (void); struct console hwc_console = { - name:hwc_console_name, - write:hwc_console_write, - device:hwc_console_device, - unblank:hwc_console_unblank, - flags:CON_PRINTBUFFER, + .name = hwc_console_name, + .write = hwc_console_write, + .device = hwc_console_device, + .unblank = hwc_console_unblank, + .flags = CON_PRINTBUFFER, }; void diff --git a/drivers/s390/char/tape.c b/drivers/s390/char/tape.c index 4cd6318ad5c4..e789672b03c3 100644 --- a/drivers/s390/char/tape.c +++ b/drivers/s390/char/tape.c @@ -199,10 +199,10 @@ typedef struct { static struct file_operations tape_proc_devices_file_ops = { - owner:THIS_MODULE, - read:tape_proc_devices_read, /* read */ - open:tape_proc_devices_open, /* open */ - release:tape_proc_devices_release, /* close */ + .owner = THIS_MODULE, + .read = tape_proc_devices_read, /* read */ + .open = tape_proc_devices_open, /* open */ + .release = tape_proc_devices_release, /* close */ }; /* diff --git a/drivers/s390/char/tapechar.c b/drivers/s390/char/tapechar.c index 445243d40cda..9320deb36172 100644 --- a/drivers/s390/char/tapechar.c +++ b/drivers/s390/char/tapechar.c @@ -40,12 +40,12 @@ */ static struct file_operations tape_fops = { - owner:THIS_MODULE, - read:tapechar_read, - write:tapechar_write, - ioctl:tapechar_ioctl, - open:tapechar_open, - release:tapechar_release, + .owner = THIS_MODULE, + .read = tapechar_read, + .write = tapechar_write, + .ioctl = tapechar_ioctl, + .open = tapechar_open, + .release = tapechar_release, }; int tapechar_major = TAPECHAR_MAJOR; diff --git a/drivers/s390/char/tubfs.c b/drivers/s390/char/tubfs.c index 93a1fa186258..f1320a57abec 100644 --- a/drivers/s390/char/tubfs.c +++ b/drivers/s390/char/tubfs.c @@ -24,13 +24,13 @@ extern void tty3270_refresh(tub_t *); static struct file_operations fs3270_fops = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)) - owner: THIS_MODULE, /* owner */ + .owner = THIS_MODULE, /* owner */ #endif - read: fs3270_read, /* read */ - write: fs3270_write, /* write */ - ioctl: fs3270_ioctl, /* ioctl */ - open: fs3270_open, /* open */ - release:fs3270_close, /* release */ + .read = fs3270_read, /* read */ + .write = fs3270_write, /* write */ + .ioctl = fs3270_ioctl, /* ioctl */ + .open = fs3270_open, /* open */ + .release = fs3270_close, /* release */ }; #ifdef CONFIG_DEVFS_FS diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 63924ea90429..bf537de7a918 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c @@ -113,13 +113,13 @@ chsc_get_sch_desc_irq(int irq) *ssd_res = &chsc_area_ssd.response_block.response_block_data.ssd_res; chsc_area_ssd = (chsc_area_t) { - request_block: { - command_code1: 0x0010, - command_code2: 0x0004, - request_block_data: { - ssd_req: { - f_sch: irq, - l_sch: irq, + .request_block = { + .command_code1 = 0x0010, + .command_code2 = 0x0004, + .request_block_data = { + .ssd_req = { + .f_sch = irq, + .l_sch = irq, } } } @@ -545,9 +545,9 @@ s390_process_css( void ) * allocation or prove that this function does not have to be * reentrant! */ static chsc_area_t chsc_area_sei __attribute__ ((aligned(PAGE_SIZE))) = { - request_block: { - command_code1: 0x0010, - command_code2: 0x000e + .request_block = { + .command_code1 = 0x0010, + .command_code2 = 0x000e } }; diff --git a/drivers/s390/cio/proc.c b/drivers/s390/cio/proc.c index 8277fa29eb1a..29c40b27232a 100644 --- a/drivers/s390/cio/proc.c +++ b/drivers/s390/cio/proc.c @@ -154,7 +154,7 @@ chan_subch_read (struct file *file, char *user_buf, size_t user_len, } static struct file_operations chan_subch_file_ops = { - read:chan_subch_read, open:chan_subch_open, release:chan_subch_close, + .read = chan_subch_read, .open = chan_subch_open, .release = chan_subch_close, }; static int @@ -245,8 +245,8 @@ cio_irq_proc_read (struct file *file, char *user_buf, size_t user_len, } static struct file_operations cio_irq_proc_file_ops = { - read:cio_irq_proc_read, open:cio_irq_proc_open, - release:cio_irq_proc_close, + .read = cio_irq_proc_read, .open = cio_irq_proc_open, + .release = cio_irq_proc_close, }; static int diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index a75d9d0616e3..4143978c568c 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c @@ -2865,17 +2865,17 @@ static ssize_t ctc_stat_read(struct file *file, char *buf, size_t count, } static struct file_operations ctc_stat_fops = { - read: ctc_stat_read, - write: ctc_stat_write, - open: ctc_stat_open, - release: ctc_stat_close, + .read = ctc_stat_read, + .write = ctc_stat_write, + .open = ctc_stat_open, + .release = ctc_stat_close, }; static struct file_operations ctc_ctrl_fops = { - read: ctc_ctrl_read, - write: ctc_ctrl_write, - open: ctc_ctrl_open, - release: ctc_ctrl_close, + .read = ctc_ctrl_read, + .write = ctc_ctrl_write, + .open = ctc_ctrl_open, + .release = ctc_ctrl_close, }; static struct proc_dir_entry *ctc_dir = NULL; diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index f18e05dd1490..09043beb34dd 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -465,13 +465,13 @@ netiucv_callback_connres(iucv_ConnectionResumed *eib, void *pgm_data) } static iucv_interrupt_ops_t netiucv_ops = { - ConnectionPending: netiucv_callback_connreq, - ConnectionComplete: netiucv_callback_connack, - ConnectionSevered: netiucv_callback_connrej, - ConnectionQuiesced: netiucv_callback_connsusp, - ConnectionResumed: netiucv_callback_connres, - MessagePending: netiucv_callback_rx, - MessageComplete: netiucv_callback_txdone + .ConnectionPending = netiucv_callback_connreq, + .ConnectionComplete = netiucv_callback_connack, + .ConnectionSevered = netiucv_callback_connrej, + .ConnectionQuiesced = netiucv_callback_connsusp, + .ConnectionResumed = netiucv_callback_connres, + .MessagePending = netiucv_callback_rx, + .MessageComplete = netiucv_callback_txdone }; /** @@ -1566,24 +1566,24 @@ netiucv_stat_read(struct file *file, char *buf, size_t count, loff_t *off) } static struct file_operations netiucv_stat_fops = { - read: netiucv_stat_read, - write: netiucv_stat_write, - open: netiucv_stat_open, - release: netiucv_stat_close, + .read = netiucv_stat_read, + .write = netiucv_stat_write, + .open = netiucv_stat_open, + .release = netiucv_stat_close, }; static struct file_operations netiucv_buffer_fops = { - read: netiucv_buffer_read, - write: netiucv_buffer_write, - open: netiucv_buffer_open, - release: netiucv_buffer_close, + .read = netiucv_buffer_read, + .write = netiucv_buffer_write, + .open = netiucv_buffer_open, + .release = netiucv_buffer_close, }; static struct file_operations netiucv_user_fops = { - read: netiucv_user_read, - write: netiucv_user_write, - open: netiucv_user_open, - release: netiucv_user_close, + .read = netiucv_user_read, + .write = netiucv_user_write, + .open = netiucv_user_open, + .release = netiucv_user_close, }; static struct proc_dir_entry *netiucv_dir = NULL; -- cgit v1.2.3