Initializer conversions for drivers/block
Subsystems (2)
PATCH 1/1 Initializer conversions for drivers/block
Just a few left in drivers/block.
Linus, please apply.
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
Name: Designated initializers for drivers/block
Author: Rusty Russell
Status: Trivial
D: The old form of designated initializers are obsolete: we need to
D: replace them with the ISO C forms before 2.6. Gcc has always supported
D: both forms anyway.
drivers/block/acsi.c +1 -1
@@ -373,7 +373,7 @@ static int acsi_revalidate (struct gendi/************************* End of Prototypes **************************/ -struct timer_list acsi_timer = { function: acsi_times_out }; +struct timer_list acsi_timer = { .function = acsi_times_out };#ifdef CONFIG_ATARI_SLM
drivers/block/acsi_slm.c +6 -6
@@ -273,12 +273,12 @@ static int slm_get_pagesize( int device,static struct timer_list slm_timer = { function: slm_test_ready };static struct file_operations slm_fops = { - owner:THIS_MODULE , - read: slm_read, - write: slm_write, - ioctl: slm_ioctl, - open: slm_open, - release: slm_release, + .owner =THIS_MODULE , + .read = slm_read, + .write = slm_write, + .ioctl = slm_ioctl, + .open = slm_open, + .release = slm_release, };
drivers/block/cciss.c +4 -4
@@ -2505,10 +2505,10 @@ static void __devexit cciss_remove_one ( }static struct pci_driver cciss_pci_driver = { - name:"cciss" , - probe: cciss_init_one, - remove:__devexit_p (cciss_remove_one), - id_table: cciss_pci_device_id,/* id_table */ + .name ="cciss" , + .probe = cciss_init_one, + .remove =__devexit_p (cciss_remove_one), + .id_table = cciss_pci_device_id,/* id_table */ };/*
drivers/block/elevator.c +3 -3
@@ -348,9 +348,9 @@ inline struct list_head *elv_get_sort_he }elevator_t elevator_noop = { - elevator_merge_fn: elevator_noop_merge, - elevator_next_req_fn: elevator_noop_next_request, - elevator_add_req_fn: elevator_noop_add_request, + .elevator_merge_fn = elevator_noop_merge, + .elevator_next_req_fn = elevator_noop_next_request, + .elevator_add_req_fn = elevator_noop_add_request, };module_init (elevator_global_init);
drivers/block/genhd.c +4 -4
@@ -239,10 +239,10 @@ static int show_partition(struct seq_fil }struct seq_operations partitions_op = { - start: part_start, - next: part_next, - stop: part_stop, - show: show_partition + .start =part_start, + .next = part_next, + .stop = part_stop, + .show = show_partition };#endif
drivers/block/loop.c +10 -10
@@ -137,15 +137,15 @@ static int xor_status(struct loop_device }struct loop_func_table none_funcs = { - number:LO_CRYPT_NONE , - transfer: transfer_none, - init: none_status, + .number =LO_CRYPT_NONE , + .transfer = transfer_none, + .init = none_status, };struct loop_func_table xor_funcs = { - number:LO_CRYPT_XOR , - transfer: transfer_xor, - init: xor_status + .number =LO_CRYPT_XOR , + .transfer = transfer_xor, + .init = xor_status };/* xfer_funcs[0] is special - its release function is never called */
@@ -971,10 +971,10 @@ static int lo_release(struct inode *inod }static struct block_device_operations lo_fops = { - owner:THIS_MODULE , - open: lo_open, - release: lo_release, - ioctl: lo_ioctl, + .owner =THIS_MODULE , + .open = lo_open, + .release = lo_release, + .ioctl = lo_ioctl, };/*
drivers/block/nbd.c +4 -4
@@ -466,10 +466,10 @@ static int nbd_release(struct inode *inostatic struct block_device_operations nbd_fops = { - owner:THIS_MODULE , - open: nbd_open, - release: nbd_release, - ioctl: nbd_ioctl, + .owner =THIS_MODULE , + .open = nbd_open, + .release = nbd_release, + .ioctl = nbd_ioctl, };/*
drivers/block/paride/pg.c +5 -5
@@ -254,11 +254,11 @@ static char pg_scratch[512];/* kernel glue structures */ static struct file_operations pg_fops = { - owner:THIS_MODULE , - read: pg_read, - write: pg_write, - open: pg_open, - release: pg_release, + .owner =THIS_MODULE , + .read = pg_read, + .write = pg_write, + .open = pg_open, + .release = pg_release, };void pg_init_units (void )
drivers/block/paride/pt.c +6 -6
@@ -256,12 +256,12 @@ static char pt_scratch[512];/* kernel glue structures */ static struct file_operations pt_fops = { - owner:THIS_MODULE , - read: pt_read, - write: pt_write, - ioctl: pt_ioctl, - open: pt_open, - release: pt_release, + .owner =THIS_MODULE , + .read = pt_read, + .write = pt_write, + .ioctl = pt_ioctl, + .open = pt_open, + .release = pt_release, };void pt_init_units (void )
drivers/block/ps2esdi.c +2 -2
@@ -96,7 +96,7 @@ static int ps2esdi_read_status_words(intstatic void dump_cmd_complete_status (u_int int_ret_code); -static void ps2esdi_get_device_cfg (void ); +static void ps2esdi_get_device_cfg (void );static void ps2esdi_reset_timer (unsigned long unused);
@@ -107,7 +107,7 @@ static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_istatic int no_int_yet;static int ps2esdi_drives;static u_short io_base; -static struct timer_list esdi_timer = { function: ps2esdi_reset_timer }; +static struct timer_list esdi_timer = { .function = ps2esdi_reset_timer };static int reset_status;static int ps2esdi_slot =-1 ;static int tp720esdi =0 ;/* Is it Integrated ESDI of ThinkPad-720? */
drivers/block/rd.c +9 -9
@@ -141,10 +141,10 @@ static int ramdisk_commit_write(struct f }static struct address_space_operations ramdisk_aops = { - readpage: ramdisk_readpage, - writepage: fail_writepage, - prepare_write: ramdisk_prepare_write, - commit_write: ramdisk_commit_write, + .readpage = ramdisk_readpage, + .writepage = fail_writepage, + .prepare_write = ramdisk_prepare_write, + .commit_write = ramdisk_commit_write, }; static int rd_blkdev_pagecache_IO(int rw, struct bio_vec *vec,
@@ -346,8 +346,8 @@ static int initrd_release(struct inode *static struct file_operations initrd_fops = { - read: initrd_read, - release: initrd_release, + .read = initrd_read, + .release = initrd_release, };#endif
@@ -394,9 +394,9 @@ static int rd_open(struct inode * inode, }static struct block_device_operations rd_bd_op = { - owner:THIS_MODULE , - open: rd_open, - ioctl: rd_ioctl, + .owner =THIS_MODULE , + .open = rd_open, + .ioctl = rd_ioctl, };/* Before freeing the module, invalidate all of the protected buffers! */
drivers/block/umem.c +6 -6
@@ -1122,18 +1122,18 @@ static void mm_pci_remove(struct pci_dev }static const struct pci_device_id __devinitdata mm_pci_ids[] = { { - vendor:PCI_VENDOR_ID_MICRO_MEMORY , - device:PCI_DEVICE_ID_MICRO_MEMORY_5415CN , + .vendor =PCI_VENDOR_ID_MICRO_MEMORY , + .device =PCI_DEVICE_ID_MICRO_MEMORY_5415CN , }, {/* end: all zeroes */ } };MODULE_DEVICE_TABLE (pci, mm_pci_ids);static struct pci_driver mm_pci_driver = { - name:"umem" , - id_table: mm_pci_ids, - probe: mm_pci_probe, - remove: mm_pci_remove, + .name ="umem" , + .id_table = mm_pci_ids, + .probe = mm_pci_probe, + .remove = mm_pci_remove, };/* -----------------------------------------------------------------------------------
drivers/block/ps2esdi.c static int ps2esdi_read_status_words(int · line 99
Quoted 6 lines · Rusty Russell
drivers/block/ps2esdi.c +1
-1@@ -96,7 +96,7 @@ static int ps2esdi_read_status_words(intstatic void dump_cmd_complete_status (u_int int_ret_code); -static void ps2esdi_get_device_cfg (void ); +static void ps2esdi_get_device_cfg (void );
This seems to be crufty change.
regards
john
Signature · 3 lines
"When a man has nothing to say, the worst thing he can do is to say it memorably." - Calvin Trillin