Skip to content

Commit

Permalink
firewire: ohci: change confusing name of a struct member
Browse files Browse the repository at this point in the history
We have got

	struct descriptor *descriptors;
	dma_addr_t         descriptors_bus;

	dma_addr_t         buffer_bus;
	struct descriptor buffer[0];

	void      *misc_buffer;
	dma_addr_t misc_buffer_bus;

	__be32    *config_rom;
	dma_addr_t config_rom_bus;
	__be32    *next_config_rom;
	dma_addr_t next_config_rom_bus;

But then we have got

	__le32    *self_id_cpu;
	dma_addr_t self_id_bus;

Better apply the pattern of xyz vs. xyz_bus to self_id vs. self_id_bus
as well.  The _cpu suffix looks particularly weird in conversions from
little endian to CPU endian.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Stefan Richter committed Aug 19, 2013
1 parent 0a41981 commit af53122
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/firewire/ohci.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ struct fw_ohci {
dma_addr_t next_config_rom_bus;
__be32 next_header;

__le32 *self_id_cpu;
__le32 *self_id;
dma_addr_t self_id_bus;
struct work_struct bus_reset_work;

Expand Down Expand Up @@ -1929,12 +1929,12 @@ static void bus_reset_work(struct work_struct *work)
return;
}

generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff;
generation = (cond_le32_to_cpu(ohci->self_id[0]) >> 16) & 0xff;
rmb();

for (i = 1, j = 0; j < self_id_count; i += 2, j++) {
u32 id = cond_le32_to_cpu(ohci->self_id_cpu[i]);
u32 id2 = cond_le32_to_cpu(ohci->self_id_cpu[i + 1]);
u32 id = cond_le32_to_cpu(ohci->self_id[i]);
u32 id2 = cond_le32_to_cpu(ohci->self_id[i + 1]);

if (id != ~id2) {
/*
Expand Down Expand Up @@ -3692,7 +3692,7 @@ static int pci_probe(struct pci_dev *dev,
goto fail_contexts;
}

ohci->self_id_cpu = ohci->misc_buffer + PAGE_SIZE/2;
ohci->self_id = ohci->misc_buffer + PAGE_SIZE/2;
ohci->self_id_bus = ohci->misc_buffer_bus + PAGE_SIZE/2;

bus_options = reg_read(ohci, OHCI1394_BusOptions);
Expand Down

0 comments on commit af53122

Please sign in to comment.