aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-card.c2
-rw-r--r--drivers/firewire/fw-iso.c5
-rw-r--r--drivers/firewire/fw-transaction.c13
-rw-r--r--drivers/firewire/fw-transaction.h4
4 files changed, 6 insertions, 18 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 681bb8d4ef63..5b4c0d9f5173 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -167,7 +167,6 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
167 167
168 return 0; 168 return 0;
169} 169}
170EXPORT_SYMBOL(fw_core_add_descriptor);
171 170
172void 171void
173fw_core_remove_descriptor(struct fw_descriptor *desc) 172fw_core_remove_descriptor(struct fw_descriptor *desc)
@@ -182,7 +181,6 @@ fw_core_remove_descriptor(struct fw_descriptor *desc)
182 181
183 mutex_unlock(&card_mutex); 182 mutex_unlock(&card_mutex);
184} 183}
185EXPORT_SYMBOL(fw_core_remove_descriptor);
186 184
187static const char gap_count_table[] = { 185static const char gap_count_table[] = {
188 63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40 186 63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c
index 2b640e9be6de..bcbe794a3ea5 100644
--- a/drivers/firewire/fw-iso.c
+++ b/drivers/firewire/fw-iso.c
@@ -126,7 +126,6 @@ fw_iso_context_create(struct fw_card *card, int type,
126 126
127 return ctx; 127 return ctx;
128} 128}
129EXPORT_SYMBOL(fw_iso_context_create);
130 129
131void fw_iso_context_destroy(struct fw_iso_context *ctx) 130void fw_iso_context_destroy(struct fw_iso_context *ctx)
132{ 131{
@@ -134,14 +133,12 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx)
134 133
135 card->driver->free_iso_context(ctx); 134 card->driver->free_iso_context(ctx);
136} 135}
137EXPORT_SYMBOL(fw_iso_context_destroy);
138 136
139int 137int
140fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags) 138fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags)
141{ 139{
142 return ctx->card->driver->start_iso(ctx, cycle, sync, tags); 140 return ctx->card->driver->start_iso(ctx, cycle, sync, tags);
143} 141}
144EXPORT_SYMBOL(fw_iso_context_start);
145 142
146int 143int
147fw_iso_context_queue(struct fw_iso_context *ctx, 144fw_iso_context_queue(struct fw_iso_context *ctx,
@@ -153,11 +150,9 @@ fw_iso_context_queue(struct fw_iso_context *ctx,
153 150
154 return card->driver->queue_iso(ctx, packet, buffer, payload); 151 return card->driver->queue_iso(ctx, packet, buffer, payload);
155} 152}
156EXPORT_SYMBOL(fw_iso_context_queue);
157 153
158int 154int
159fw_iso_context_stop(struct fw_iso_context *ctx) 155fw_iso_context_stop(struct fw_iso_context *ctx)
160{ 156{
161 return ctx->card->driver->stop_iso(ctx); 157 return ctx->card->driver->stop_iso(ctx);
162} 158}
163EXPORT_SYMBOL(fw_iso_context_stop);
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 051be78deaba..3a59e9b783b0 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -388,10 +388,13 @@ lookup_enclosing_address_handler(struct list_head *list,
388static DEFINE_SPINLOCK(address_handler_lock); 388static DEFINE_SPINLOCK(address_handler_lock);
389static LIST_HEAD(address_handler_list); 389static LIST_HEAD(address_handler_list);
390 390
391const struct fw_address_region fw_low_memory_region =
392 { .start = 0x000000000000ULL, .end = 0x000100000000ULL, };
393const struct fw_address_region fw_high_memory_region = 391const struct fw_address_region fw_high_memory_region =
394 { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, }; 392 { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, };
393EXPORT_SYMBOL(fw_high_memory_region);
394
395#if 0
396const struct fw_address_region fw_low_memory_region =
397 { .start = 0x000000000000ULL, .end = 0x000100000000ULL, };
395const struct fw_address_region fw_private_region = 398const struct fw_address_region fw_private_region =
396 { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, }; 399 { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, };
397const struct fw_address_region fw_csr_region = 400const struct fw_address_region fw_csr_region =
@@ -399,11 +402,7 @@ const struct fw_address_region fw_csr_region =
399 .end = CSR_REGISTER_BASE | CSR_CONFIG_ROM_END, }; 402 .end = CSR_REGISTER_BASE | CSR_CONFIG_ROM_END, };
400const struct fw_address_region fw_unit_space_region = 403const struct fw_address_region fw_unit_space_region =
401 { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, }; 404 { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, };
402EXPORT_SYMBOL(fw_low_memory_region); 405#endif /* 0 */
403EXPORT_SYMBOL(fw_high_memory_region);
404EXPORT_SYMBOL(fw_private_region);
405EXPORT_SYMBOL(fw_csr_region);
406EXPORT_SYMBOL(fw_unit_space_region);
407 406
408/** 407/**
409 * Allocate a range of addresses in the node space of the OHCI 408 * Allocate a range of addresses in the node space of the OHCI
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 8d1987f9c61e..04d3854f6560 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -201,11 +201,7 @@ struct fw_address_region {
201 u64 end; 201 u64 end;
202}; 202};
203 203
204extern const struct fw_address_region fw_low_memory_region;
205extern const struct fw_address_region fw_high_memory_region; 204extern const struct fw_address_region fw_high_memory_region;
206extern const struct fw_address_region fw_private_region;
207extern const struct fw_address_region fw_csr_region;
208extern const struct fw_address_region fw_unit_space_region;
209 205
210int fw_core_add_address_handler(struct fw_address_handler *handler, 206int fw_core_add_address_handler(struct fw_address_handler *handler,
211 const struct fw_address_region *region); 207 const struct fw_address_region *region);