Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8be076 authored by Adrian Bunk's avatar Adrian Bunk Committed by Stefan Richter
Browse files

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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 25b1c3d8

drivers/firewire/fw-card.c

+0 −2
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ fw_core_add_descriptor(struct fw_descriptor *desc) 


	return 0;

}

EXPORT_SYMBOL(fw_core_add_descriptor);



void

fw_core_remove_descriptor(struct fw_descriptor *desc)
@@ -182,7 +181,6 @@ fw_core_remove_descriptor(struct fw_descriptor *desc) 


	mutex_unlock(&card_mutex);

}

EXPORT_SYMBOL(fw_core_remove_descriptor);



static const char gap_count_table[] = {

	63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40

drivers/firewire/fw-iso.c

+0 −5
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ fw_iso_context_create(struct fw_card *card, int type, 


	return ctx;

}

EXPORT_SYMBOL(fw_iso_context_create);



void fw_iso_context_destroy(struct fw_iso_context *ctx)

{
@@ -134,14 +133,12 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx) 


	card->driver->free_iso_context(ctx);

}

EXPORT_SYMBOL(fw_iso_context_destroy);



int

fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags)

{

	return ctx->card->driver->start_iso(ctx, cycle, sync, tags);

}

EXPORT_SYMBOL(fw_iso_context_start);



int

fw_iso_context_queue(struct fw_iso_context *ctx,
@@ -153,11 +150,9 @@ fw_iso_context_queue(struct fw_iso_context *ctx, 


	return card->driver->queue_iso(ctx, packet, buffer, payload);

}

EXPORT_SYMBOL(fw_iso_context_queue);



int

fw_iso_context_stop(struct fw_iso_context *ctx)

{

	return ctx->card->driver->stop_iso(ctx);

}
 
EXPORT_SYMBOL(fw_iso_context_stop);

drivers/firewire/fw-transaction.c

+6 −7
Original line number Diff line number Diff line
@@ -388,10 +388,13 @@ lookup_enclosing_address_handler(struct list_head *list, 
static DEFINE_SPINLOCK(address_handler_lock);

static LIST_HEAD(address_handler_list);



const struct fw_address_region fw_low_memory_region =

	{ .start = 0x000000000000ULL, .end = 0x000100000000ULL,  };

const struct fw_address_region fw_high_memory_region =

	{ .start = 0x000100000000ULL, .end = 0xffffe0000000ULL,  };

EXPORT_SYMBOL(fw_high_memory_region);



#if 0

const struct fw_address_region fw_low_memory_region =

	{ .start = 0x000000000000ULL, .end = 0x000100000000ULL,  };

const struct fw_address_region fw_private_region =

	{ .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL,  };

const struct fw_address_region fw_csr_region =
@@ -399,11 +402,7 @@ const struct fw_address_region fw_csr_region = 
	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM_END,  };

const struct fw_address_region fw_unit_space_region =

	{ .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, };

EXPORT_SYMBOL(fw_low_memory_region);

EXPORT_SYMBOL(fw_high_memory_region);

EXPORT_SYMBOL(fw_private_region);

EXPORT_SYMBOL(fw_csr_region);

EXPORT_SYMBOL(fw_unit_space_region);

#endif  /*  0  */



/**

 * Allocate a range of addresses in the node space of the OHCI

drivers/firewire/fw-transaction.h

+0 −4
Original line number Diff line number Diff line
@@ -201,11 +201,7 @@ struct fw_address_region { 
	u64 end;

};



extern const struct fw_address_region fw_low_memory_region;

extern const struct fw_address_region fw_high_memory_region;

extern const struct fw_address_region fw_private_region;

extern const struct fw_address_region fw_csr_region;

extern const struct fw_address_region fw_unit_space_region;



int fw_core_add_address_handler(struct fw_address_handler *handler,

				const struct fw_address_region *region);