aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/firewire/fw-card.c12
-rw-r--r--drivers/firewire/fw-sbp2.c4
-rw-r--r--drivers/firewire/fw-topology.c6
-rw-r--r--drivers/firewire/fw-topology.h2
-rw-r--r--drivers/firewire/fw-transaction.h42
5 files changed, 33 insertions, 33 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 3322d6169bd1..74aab9aafd21 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -60,7 +60,7 @@ static int descriptor_count;
60#define bib_imc ((1) << 31) 60#define bib_imc ((1) << 31)
61 61
62static u32 * 62static u32 *
63generate_config_rom (struct fw_card *card, size_t *config_rom_length) 63generate_config_rom(struct fw_card *card, size_t *config_rom_length)
64{ 64{
65 struct fw_descriptor *desc; 65 struct fw_descriptor *desc;
66 static u32 config_rom[256]; 66 static u32 config_rom[256];
@@ -125,7 +125,7 @@ generate_config_rom (struct fw_card *card, size_t *config_rom_length)
125} 125}
126 126
127static void 127static void
128update_config_roms (void) 128update_config_roms(void)
129{ 129{
130 struct fw_card *card; 130 struct fw_card *card;
131 u32 *config_rom; 131 u32 *config_rom;
@@ -138,7 +138,7 @@ update_config_roms (void)
138} 138}
139 139
140int 140int
141fw_core_add_descriptor (struct fw_descriptor *desc) 141fw_core_add_descriptor(struct fw_descriptor *desc)
142{ 142{
143 size_t i; 143 size_t i;
144 144
@@ -156,7 +156,7 @@ fw_core_add_descriptor (struct fw_descriptor *desc)
156 156
157 mutex_lock(&card_mutex); 157 mutex_lock(&card_mutex);
158 158
159 list_add_tail (&desc->link, &descriptor_list); 159 list_add_tail(&desc->link, &descriptor_list);
160 descriptor_count++; 160 descriptor_count++;
161 if (desc->immediate > 0) 161 if (desc->immediate > 0)
162 descriptor_count++; 162 descriptor_count++;
@@ -169,7 +169,7 @@ fw_core_add_descriptor (struct fw_descriptor *desc)
169EXPORT_SYMBOL(fw_core_add_descriptor); 169EXPORT_SYMBOL(fw_core_add_descriptor);
170 170
171void 171void
172fw_core_remove_descriptor (struct fw_descriptor *desc) 172fw_core_remove_descriptor(struct fw_descriptor *desc)
173{ 173{
174 mutex_lock(&card_mutex); 174 mutex_lock(&card_mutex);
175 175
@@ -419,7 +419,7 @@ fw_card_add(struct fw_card *card,
419 fw_card_get(card); 419 fw_card_get(card);
420 420
421 mutex_lock(&card_mutex); 421 mutex_lock(&card_mutex);
422 config_rom = generate_config_rom (card, &length); 422 config_rom = generate_config_rom(card, &length);
423 list_add_tail(&card->link, &card_list); 423 list_add_tail(&card->link, &card_list);
424 mutex_unlock(&card_mutex); 424 mutex_unlock(&card_mutex);
425 425
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index eb3bddb162e4..3308bc089beb 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -47,7 +47,7 @@
47#include "fw-device.h" 47#include "fw-device.h"
48 48
49/* I don't know why the SCSI stack doesn't define something like this... */ 49/* I don't know why the SCSI stack doesn't define something like this... */
50typedef void (*scsi_done_fn_t) (struct scsi_cmnd *); 50typedef void (*scsi_done_fn_t)(struct scsi_cmnd *);
51 51
52static const char sbp2_driver_name[] = "sbp2"; 52static const char sbp2_driver_name[] = "sbp2";
53 53
@@ -148,7 +148,7 @@ struct sbp2_orb {
148 dma_addr_t request_bus; 148 dma_addr_t request_bus;
149 int rcode; 149 int rcode;
150 struct sbp2_pointer pointer; 150 struct sbp2_pointer pointer;
151 void (*callback) (struct sbp2_orb * orb, struct sbp2_status * status); 151 void (*callback)(struct sbp2_orb * orb, struct sbp2_status * status);
152 struct list_head link; 152 struct list_head link;
153}; 153};
154 154
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index c26d5d5e8d53..490490205ea9 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -300,9 +300,9 @@ static struct fw_node *build_tree(struct fw_card *card,
300 return local_node; 300 return local_node;
301} 301}
302 302
303typedef void (*fw_node_callback_t) (struct fw_card * card, 303typedef void (*fw_node_callback_t)(struct fw_card * card,
304 struct fw_node * node, 304 struct fw_node * node,
305 struct fw_node * parent); 305 struct fw_node * parent);
306 306
307static void 307static void
308for_each_fw_node(struct fw_card *card, struct fw_node *root, 308for_each_fw_node(struct fw_card *card, struct fw_node *root,
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index be2a6bed3847..363b6cbcd0b3 100644
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -64,7 +64,7 @@ struct fw_node {
64static inline struct fw_node * 64static inline struct fw_node *
65fw_node(struct list_head *l) 65fw_node(struct list_head *l)
66{ 66{
67 return list_entry (l, struct fw_node, link); 67 return list_entry(l, struct fw_node, link);
68} 68}
69 69
70static inline struct fw_node * 70static inline struct fw_node *
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 1b7e4dc6c2c1..a1507cf8d764 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -172,11 +172,11 @@ struct fw_descriptor {
172 const u32 *data; 172 const u32 *data;
173}; 173};
174 174
175int fw_core_add_descriptor (struct fw_descriptor *desc); 175int fw_core_add_descriptor(struct fw_descriptor *desc);
176void fw_core_remove_descriptor (struct fw_descriptor *desc); 176void fw_core_remove_descriptor(struct fw_descriptor *desc);
177 177
178typedef void (*fw_packet_callback_t) (struct fw_packet *packet, 178typedef void (*fw_packet_callback_t)(struct fw_packet *packet,
179 struct fw_card *card, int status); 179 struct fw_card *card, int status);
180 180
181typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode, 181typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
182 void *data, 182 void *data,
@@ -239,7 +239,7 @@ struct fw_transaction {
239static inline struct fw_packet * 239static inline struct fw_packet *
240fw_packet(struct list_head *l) 240fw_packet(struct list_head *l)
241{ 241{
242 return list_entry (l, struct fw_packet, link); 242 return list_entry(l, struct fw_packet, link);
243} 243}
244 244
245struct fw_address_handler { 245struct fw_address_handler {
@@ -350,11 +350,11 @@ struct fw_iso_packet {
350 350
351struct fw_iso_context; 351struct fw_iso_context;
352 352
353typedef void (*fw_iso_callback_t) (struct fw_iso_context *context, 353typedef void (*fw_iso_callback_t)(struct fw_iso_context *context,
354 u32 cycle, 354 u32 cycle,
355 size_t header_length, 355 size_t header_length,
356 void *header, 356 void *header,
357 void *data); 357 void *data);
358 358
359/* 359/*
360 * An iso buffer is just a set of pages mapped for DMA in the 360 * An iso buffer is just a set of pages mapped for DMA in the
@@ -420,23 +420,23 @@ struct fw_card_driver {
420 * enable the PHY or set the link_on bit and initiate a bus 420 * enable the PHY or set the link_on bit and initiate a bus
421 * reset. 421 * reset.
422 */ 422 */
423 int (*enable) (struct fw_card *card, u32 *config_rom, size_t length); 423 int (*enable)(struct fw_card *card, u32 *config_rom, size_t length);
424 424
425 int (*update_phy_reg) (struct fw_card *card, int address, 425 int (*update_phy_reg)(struct fw_card *card, int address,
426 int clear_bits, int set_bits); 426 int clear_bits, int set_bits);
427 427
428 /* 428 /*
429 * Update the config rom for an enabled card. This function 429 * Update the config rom for an enabled card. This function
430 * should change the config rom that is presented on the bus 430 * should change the config rom that is presented on the bus
431 * an initiate a bus reset. 431 * an initiate a bus reset.
432 */ 432 */
433 int (*set_config_rom) (struct fw_card *card, 433 int (*set_config_rom)(struct fw_card *card,
434 u32 *config_rom, size_t length); 434 u32 *config_rom, size_t length);
435 435
436 void (*send_request) (struct fw_card *card, struct fw_packet *packet); 436 void (*send_request)(struct fw_card *card, struct fw_packet *packet);
437 void (*send_response) (struct fw_card *card, struct fw_packet *packet); 437 void (*send_response)(struct fw_card *card, struct fw_packet *packet);
438 /* Calling cancel is valid once a packet has been submitted. */ 438 /* Calling cancel is valid once a packet has been submitted. */
439 int (*cancel_packet) (struct fw_card *card, struct fw_packet *packet); 439 int (*cancel_packet)(struct fw_card *card, struct fw_packet *packet);
440 440
441 /* 441 /*
442 * Allow the specified node ID to do direct DMA out and in of 442 * Allow the specified node ID to do direct DMA out and in of
@@ -446,10 +446,10 @@ struct fw_card_driver {
446 * doesn't support this, -ESTALE if the generation doesn't 446 * doesn't support this, -ESTALE if the generation doesn't
447 * match. 447 * match.
448 */ 448 */
449 int (*enable_phys_dma) (struct fw_card *card, 449 int (*enable_phys_dma)(struct fw_card *card,
450 int node_id, int generation); 450 int node_id, int generation);
451 451
452 u64 (*get_bus_time) (struct fw_card *card); 452 u64 (*get_bus_time)(struct fw_card *card);
453 453
454 struct fw_iso_context * 454 struct fw_iso_context *
455 (*allocate_iso_context)(struct fw_card *card, 455 (*allocate_iso_context)(struct fw_card *card,