diff options
-rw-r--r-- | drivers/firewire/fw-card.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-device-cdev.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-device.c | 8 | ||||
-rw-r--r-- | drivers/firewire/fw-device.h | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-ohci.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-sbp2.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-topology.h | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.c | 12 |
8 files changed, 16 insertions, 16 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index c560fd5e74fc..c8b7d695c81d 100644 --- a/drivers/firewire/fw-card.c +++ b/drivers/firewire/fw-card.c | |||
@@ -381,7 +381,7 @@ static struct fw_card_driver dummy_driver = { | |||
381 | .set_config_rom = dummy_set_config_rom, | 381 | .set_config_rom = dummy_set_config_rom, |
382 | .send_request = dummy_send_request, | 382 | .send_request = dummy_send_request, |
383 | .send_response = dummy_send_response, | 383 | .send_response = dummy_send_response, |
384 | .enable_phys_dma = dummy_enable_phys_dma | 384 | .enable_phys_dma = dummy_enable_phys_dma, |
385 | }; | 385 | }; |
386 | 386 | ||
387 | void | 387 | void |
diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c index 117bc6db54af..5ffc58c6624c 100644 --- a/drivers/firewire/fw-device-cdev.c +++ b/drivers/firewire/fw-device-cdev.c | |||
@@ -612,6 +612,6 @@ const struct file_operations fw_device_ops = { | |||
612 | .mmap = fw_device_op_mmap, | 612 | .mmap = fw_device_op_mmap, |
613 | 613 | ||
614 | #ifdef CONFIG_COMPAT | 614 | #ifdef CONFIG_COMPAT |
615 | .compat_ioctl = fw_device_op_compat_ioctl | 615 | .compat_ioctl = fw_device_op_compat_ioctl, |
616 | #endif | 616 | #endif |
617 | }; | 617 | }; |
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index 559b9340e8fd..f1b0e75fd91e 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c | |||
@@ -154,7 +154,7 @@ fw_unit_uevent(struct device *dev, char **envp, int num_envp, | |||
154 | struct bus_type fw_bus_type = { | 154 | struct bus_type fw_bus_type = { |
155 | .name = "fw", | 155 | .name = "fw", |
156 | .match = fw_unit_match, | 156 | .match = fw_unit_match, |
157 | .uevent = fw_unit_uevent | 157 | .uevent = fw_unit_uevent, |
158 | }; | 158 | }; |
159 | EXPORT_SYMBOL(fw_bus_type); | 159 | EXPORT_SYMBOL(fw_bus_type); |
160 | 160 | ||
@@ -209,8 +209,8 @@ show_modalias_attribute(struct device *dev, | |||
209 | } | 209 | } |
210 | 210 | ||
211 | static struct device_attribute modalias_attribute = { | 211 | static struct device_attribute modalias_attribute = { |
212 | .attr = {.name = "modalias",.mode = S_IRUGO}, | 212 | .attr = { .name = "modalias", .mode = S_IRUGO, }, |
213 | .show = show_modalias_attribute | 213 | .show = show_modalias_attribute, |
214 | }; | 214 | }; |
215 | 215 | ||
216 | static ssize_t | 216 | static ssize_t |
@@ -225,7 +225,7 @@ show_config_rom_attribute(struct device *dev, | |||
225 | } | 225 | } |
226 | 226 | ||
227 | static struct device_attribute config_rom_attribute = { | 227 | static struct device_attribute config_rom_attribute = { |
228 | .attr = {.name = "config_rom",.mode = S_IRUGO}, | 228 | .attr = {.name = "config_rom", .mode = S_IRUGO,}, |
229 | .show = show_config_rom_attribute, | 229 | .show = show_config_rom_attribute, |
230 | }; | 230 | }; |
231 | 231 | ||
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h index b150adb42533..5399b48f5538 100644 --- a/drivers/firewire/fw-device.h +++ b/drivers/firewire/fw-device.h | |||
@@ -28,7 +28,7 @@ | |||
28 | enum fw_device_state { | 28 | enum fw_device_state { |
29 | FW_DEVICE_INITIALIZING, | 29 | FW_DEVICE_INITIALIZING, |
30 | FW_DEVICE_RUNNING, | 30 | FW_DEVICE_RUNNING, |
31 | FW_DEVICE_SHUTDOWN | 31 | FW_DEVICE_SHUTDOWN, |
32 | }; | 32 | }; |
33 | 33 | ||
34 | struct fw_device { | 34 | struct fw_device { |
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 1f34bdd95c85..ea52e150a8e6 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
@@ -1157,7 +1157,7 @@ static const struct fw_card_driver ohci_driver = { | |||
1157 | .allocate_iso_context = ohci_allocate_iso_context, | 1157 | .allocate_iso_context = ohci_allocate_iso_context, |
1158 | .free_iso_context = ohci_free_iso_context, | 1158 | .free_iso_context = ohci_free_iso_context, |
1159 | .queue_iso = ohci_queue_iso, | 1159 | .queue_iso = ohci_queue_iso, |
1160 | .send_iso = ohci_send_iso | 1160 | .send_iso = ohci_send_iso, |
1161 | }; | 1161 | }; |
1162 | 1162 | ||
1163 | static int software_reset(struct fw_ohci *ohci) | 1163 | static int software_reset(struct fw_ohci *ohci) |
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 28acae8b01b3..13e47e942c12 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
@@ -685,7 +685,7 @@ static const struct fw_device_id sbp2_id_table[] = { | |||
685 | { | 685 | { |
686 | .match_flags = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION, | 686 | .match_flags = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION, |
687 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY, | 687 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY, |
688 | .version = SBP2_SW_VERSION_ENTRY | 688 | .version = SBP2_SW_VERSION_ENTRY, |
689 | }, | 689 | }, |
690 | { } | 690 | { } |
691 | }; | 691 | }; |
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h index 4311d9f890d3..ab03059a0da1 100644 --- a/drivers/firewire/fw-topology.h +++ b/drivers/firewire/fw-topology.h | |||
@@ -27,7 +27,7 @@ enum { | |||
27 | FW_NODE_UPDATED = 0x01, | 27 | FW_NODE_UPDATED = 0x01, |
28 | FW_NODE_DESTROYED = 0x02, | 28 | FW_NODE_DESTROYED = 0x02, |
29 | FW_NODE_LINK_ON = 0x03, | 29 | FW_NODE_LINK_ON = 0x03, |
30 | FW_NODE_LINK_OFF = 0x04 | 30 | FW_NODE_LINK_OFF = 0x04, |
31 | }; | 31 | }; |
32 | 32 | ||
33 | struct fw_port { | 33 | struct fw_port { |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 79563b2848fa..4c1275f9a3b4 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
@@ -332,15 +332,15 @@ static DEFINE_SPINLOCK(address_handler_lock); | |||
332 | static LIST_HEAD(address_handler_list); | 332 | static LIST_HEAD(address_handler_list); |
333 | 333 | ||
334 | const struct fw_address_region fw_low_memory_region = | 334 | const struct fw_address_region fw_low_memory_region = |
335 | { 0x000000000000ull, 0x000100000000ull }; | 335 | { .start = 0x000000000000ULL, .end = 0x000100000000ULL, }; |
336 | const struct fw_address_region fw_high_memory_region = | 336 | const struct fw_address_region fw_high_memory_region = |
337 | { 0x000100000000ull, 0xffffe0000000ull }; | 337 | { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, }; |
338 | const struct fw_address_region fw_private_region = | 338 | const struct fw_address_region fw_private_region = |
339 | { 0xffffe0000000ull, 0xfffff0000000ull }; | 339 | { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, }; |
340 | const struct fw_address_region fw_csr_region = | 340 | const struct fw_address_region fw_csr_region = |
341 | { 0xfffff0000000ULL, 0xfffff0000800ull }; | 341 | { .start = 0xfffff0000000ULL, .end = 0xfffff0000800ULL, }; |
342 | const struct fw_address_region fw_unit_space_region = | 342 | const struct fw_address_region fw_unit_space_region = |
343 | { 0xfffff0000900ull, 0x1000000000000ull }; | 343 | { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, }; |
344 | EXPORT_SYMBOL(fw_low_memory_region); | 344 | EXPORT_SYMBOL(fw_low_memory_region); |
345 | EXPORT_SYMBOL(fw_high_memory_region); | 345 | EXPORT_SYMBOL(fw_high_memory_region); |
346 | EXPORT_SYMBOL(fw_private_region); | 346 | EXPORT_SYMBOL(fw_private_region); |
@@ -692,7 +692,7 @@ static const u32 vendor_textual_descriptor_data[] = { | |||
692 | static struct fw_descriptor vendor_textual_descriptor = { | 692 | static struct fw_descriptor vendor_textual_descriptor = { |
693 | .length = ARRAY_SIZE(vendor_textual_descriptor_data), | 693 | .length = ARRAY_SIZE(vendor_textual_descriptor_data), |
694 | .key = 0x81000000, | 694 | .key = 0x81000000, |
695 | .data = vendor_textual_descriptor_data | 695 | .data = vendor_textual_descriptor_data, |
696 | }; | 696 | }; |
697 | 697 | ||
698 | static int __init fw_core_init(void) | 698 | static int __init fw_core_init(void) |