Date: Sun, 21 Jan 2007 20:45:32 +0100 (CET) From: Stefan Richter Subject: firewire: comma after last enum item or initializer Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg --- Update: added fw-device.c::modalias_attribute Index: linux/drivers/firewire/fw-card.c =================================================================== --- linux.orig/drivers/firewire/fw-card.c 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-card.c 2007-01-21 20:08:11.000000000 +0100 @@ -381,7 +381,7 @@ static struct fw_card_driver dummy_drive .set_config_rom = dummy_set_config_rom, .send_request = dummy_send_request, .send_response = dummy_send_response, - .enable_phys_dma = dummy_enable_phys_dma + .enable_phys_dma = dummy_enable_phys_dma, }; void Index: linux/drivers/firewire/fw-device-cdev.c =================================================================== --- linux.orig/drivers/firewire/fw-device-cdev.c 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-device-cdev.c 2007-01-21 20:08:11.000000000 +0100 @@ -612,6 +612,6 @@ const struct file_operations fw_device_o .mmap = fw_device_op_mmap, #ifdef CONFIG_COMPAT - .compat_ioctl = fw_device_op_compat_ioctl + .compat_ioctl = fw_device_op_compat_ioctl, #endif }; Index: linux/drivers/firewire/fw-device.c =================================================================== --- linux.orig/drivers/firewire/fw-device.c 2007-01-21 20:05:37.000000000 +0100 +++ linux/drivers/firewire/fw-device.c 2007-01-21 20:08:11.000000000 +0100 @@ -154,7 +154,7 @@ fw_unit_uevent(struct device *dev, char struct bus_type fw_bus_type = { .name = "fw", .match = fw_unit_match, - .uevent = fw_unit_uevent + .uevent = fw_unit_uevent, }; EXPORT_SYMBOL(fw_bus_type); @@ -209,8 +209,8 @@ show_modalias_attribute(struct device *d } static struct device_attribute modalias_attribute = { - .attr = {.name = "modalias",.mode = S_IRUGO}, - .show = show_modalias_attribute + .attr = { .name = "modalias", .mode = S_IRUGO, }, + .show = show_modalias_attribute, }; static ssize_t @@ -225,7 +225,7 @@ show_config_rom_attribute(struct device } static struct device_attribute config_rom_attribute = { - .attr = {.name = "config_rom",.mode = S_IRUGO}, + .attr = {.name = "config_rom", .mode = S_IRUGO,}, .show = show_config_rom_attribute, }; Index: linux/drivers/firewire/fw-device.h =================================================================== --- linux.orig/drivers/firewire/fw-device.h 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-device.h 2007-01-21 20:08:11.000000000 +0100 @@ -28,7 +28,7 @@ enum fw_device_state { FW_DEVICE_INITIALIZING, FW_DEVICE_RUNNING, - FW_DEVICE_SHUTDOWN + FW_DEVICE_SHUTDOWN, }; struct fw_device { Index: linux/drivers/firewire/fw-ohci.c =================================================================== --- linux.orig/drivers/firewire/fw-ohci.c 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-ohci.c 2007-01-21 20:08:11.000000000 +0100 @@ -1157,7 +1157,7 @@ static const struct fw_card_driver ohci_ .allocate_iso_context = ohci_allocate_iso_context, .free_iso_context = ohci_free_iso_context, .queue_iso = ohci_queue_iso, - .send_iso = ohci_send_iso + .send_iso = ohci_send_iso, }; static int software_reset(struct fw_ohci *ohci) Index: linux/drivers/firewire/fw-sbp2.c =================================================================== --- linux.orig/drivers/firewire/fw-sbp2.c 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-sbp2.c 2007-01-21 20:08:11.000000000 +0100 @@ -685,7 +685,7 @@ static const struct fw_device_id sbp2_id { .match_flags = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY, - .version = SBP2_SW_VERSION_ENTRY + .version = SBP2_SW_VERSION_ENTRY, }, { } }; Index: linux/drivers/firewire/fw-topology.h =================================================================== --- linux.orig/drivers/firewire/fw-topology.h 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-topology.h 2007-01-21 20:08:11.000000000 +0100 @@ -27,7 +27,7 @@ enum { FW_NODE_UPDATED = 0x01, FW_NODE_DESTROYED = 0x02, FW_NODE_LINK_ON = 0x03, - FW_NODE_LINK_OFF = 0x04 + FW_NODE_LINK_OFF = 0x04, }; struct fw_port { Index: linux/drivers/firewire/fw-transaction.c =================================================================== --- linux.orig/drivers/firewire/fw-transaction.c 2007-01-21 20:04:36.000000000 +0100 +++ linux/drivers/firewire/fw-transaction.c 2007-01-21 20:08:11.000000000 +0100 @@ -332,15 +332,15 @@ static DEFINE_SPINLOCK(address_handler_l static LIST_HEAD(address_handler_list); const struct fw_address_region fw_low_memory_region = - { 0x000000000000ull, 0x000100000000ull }; + { .start = 0x000000000000ULL, .end = 0x000100000000ULL, }; const struct fw_address_region fw_high_memory_region = - { 0x000100000000ull, 0xffffe0000000ull }; + { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, }; const struct fw_address_region fw_private_region = - { 0xffffe0000000ull, 0xfffff0000000ull }; + { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, }; const struct fw_address_region fw_csr_region = - { 0xfffff0000000ULL, 0xfffff0000800ull }; + { .start = 0xfffff0000000ULL, .end = 0xfffff0000800ULL, }; const struct fw_address_region fw_unit_space_region = - { 0xfffff0000900ull, 0x1000000000000ull }; + { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, }; EXPORT_SYMBOL(fw_low_memory_region); EXPORT_SYMBOL(fw_high_memory_region); EXPORT_SYMBOL(fw_private_region); @@ -692,7 +692,7 @@ static const u32 vendor_textual_descript static struct fw_descriptor vendor_textual_descriptor = { .length = ARRAY_SIZE(vendor_textual_descriptor_data), .key = 0x81000000, - .data = vendor_textual_descriptor_data + .data = vendor_textual_descriptor_data, }; static int __init fw_core_init(void)