diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-03-30 19:22:11 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-18 11:55:37 -0400 |
commit | db8be076cad4b843aa743ef462c75022cddd9c63 (patch) | |
tree | e9386e3f9fcb3fbf9f51da1aa005e03ef33588a1 /drivers | |
parent | 25b1c3d8889f982ebc6c7b996cfc7fa5f1dce533 (diff) |
firewire: cleanups
This patch contains the following cleanups:
- #if 0 the following unused structs:
- fw-transaction.c:fw_low_memory_region
- fw-transaction.c:fw_private_region
- fw-transaction.c:fw_csr_region
- fw-transaction.c:fw_unit_space_region
- remove the following unused EXPORT_SYMBOL's:
- fw-card.c:fw_core_add_descriptor
- fw-card.c:fw_core_remove_descriptor
- fw-iso.c:fw_iso_context_create
- fw-iso.c:fw_iso_context_destroy
- fw-iso.c:fw_iso_context_start
- fw-iso.c:fw_iso_context_queue
- fw-iso.c:fw_iso_context_stop
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firewire/fw-card.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-iso.c | 5 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.c | 13 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.h | 4 |
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 | } |
170 | EXPORT_SYMBOL(fw_core_add_descriptor); | ||
171 | 170 | ||
172 | void | 171 | void |
173 | fw_core_remove_descriptor(struct fw_descriptor *desc) | 172 | fw_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 | } |
185 | EXPORT_SYMBOL(fw_core_remove_descriptor); | ||
186 | 184 | ||
187 | static const char gap_count_table[] = { | 185 | static 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 | } |
129 | EXPORT_SYMBOL(fw_iso_context_create); | ||
130 | 129 | ||
131 | void fw_iso_context_destroy(struct fw_iso_context *ctx) | 130 | void 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 | } |
137 | EXPORT_SYMBOL(fw_iso_context_destroy); | ||
138 | 136 | ||
139 | int | 137 | int |
140 | fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags) | 138 | fw_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 | } |
144 | EXPORT_SYMBOL(fw_iso_context_start); | ||
145 | 142 | ||
146 | int | 143 | int |
147 | fw_iso_context_queue(struct fw_iso_context *ctx, | 144 | fw_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 | } |
156 | EXPORT_SYMBOL(fw_iso_context_queue); | ||
157 | 153 | ||
158 | int | 154 | int |
159 | fw_iso_context_stop(struct fw_iso_context *ctx) | 155 | fw_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 | } |
163 | EXPORT_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, | |||
388 | static DEFINE_SPINLOCK(address_handler_lock); | 388 | static DEFINE_SPINLOCK(address_handler_lock); |
389 | static LIST_HEAD(address_handler_list); | 389 | static LIST_HEAD(address_handler_list); |
390 | 390 | ||
391 | const struct fw_address_region fw_low_memory_region = | ||
392 | { .start = 0x000000000000ULL, .end = 0x000100000000ULL, }; | ||
393 | const struct fw_address_region fw_high_memory_region = | 391 | const struct fw_address_region fw_high_memory_region = |
394 | { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, }; | 392 | { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL, }; |
393 | EXPORT_SYMBOL(fw_high_memory_region); | ||
394 | |||
395 | #if 0 | ||
396 | const struct fw_address_region fw_low_memory_region = | ||
397 | { .start = 0x000000000000ULL, .end = 0x000100000000ULL, }; | ||
395 | const struct fw_address_region fw_private_region = | 398 | const struct fw_address_region fw_private_region = |
396 | { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, }; | 399 | { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL, }; |
397 | const struct fw_address_region fw_csr_region = | 400 | const 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, }; |
400 | const struct fw_address_region fw_unit_space_region = | 403 | const struct fw_address_region fw_unit_space_region = |
401 | { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, }; | 404 | { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, }; |
402 | EXPORT_SYMBOL(fw_low_memory_region); | 405 | #endif /* 0 */ |
403 | EXPORT_SYMBOL(fw_high_memory_region); | ||
404 | EXPORT_SYMBOL(fw_private_region); | ||
405 | EXPORT_SYMBOL(fw_csr_region); | ||
406 | EXPORT_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 | ||
204 | extern const struct fw_address_region fw_low_memory_region; | ||
205 | extern const struct fw_address_region fw_high_memory_region; | 204 | extern const struct fw_address_region fw_high_memory_region; |
206 | extern const struct fw_address_region fw_private_region; | ||
207 | extern const struct fw_address_region fw_csr_region; | ||
208 | extern const struct fw_address_region fw_unit_space_region; | ||
209 | 205 | ||
210 | int fw_core_add_address_handler(struct fw_address_handler *handler, | 206 | int fw_core_add_address_handler(struct fw_address_handler *handler, |
211 | const struct fw_address_region *region); | 207 | const struct fw_address_region *region); |