Skip to content

Commit af53122

Browse files
author
Stefan Richter
committed
firewire: ohci: change confusing name of a struct member
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>
1 parent 0a41981 commit af53122

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/firewire/ohci.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ struct fw_ohci {
235235
dma_addr_t next_config_rom_bus;
236236
__be32 next_header;
237237

238-
__le32 *self_id_cpu;
238+
__le32 *self_id;
239239
dma_addr_t self_id_bus;
240240
struct work_struct bus_reset_work;
241241

@@ -1929,12 +1929,12 @@ static void bus_reset_work(struct work_struct *work)
19291929
return;
19301930
}
19311931

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

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

19391939
if (id != ~id2) {
19401940
/*
@@ -3692,7 +3692,7 @@ static int pci_probe(struct pci_dev *dev,
36923692
goto fail_contexts;
36933693
}
36943694

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

36983698
bus_options = reg_read(ohci, OHCI1394_BusOptions);

0 commit comments

Comments
 (0)