diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/firewire.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index a0e67150a729..4bd94bf5e739 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h | |||
@@ -65,12 +65,13 @@ | |||
65 | #define CSR_DIRECTORY_ID 0x20 | 65 | #define CSR_DIRECTORY_ID 0x20 |
66 | 66 | ||
67 | struct fw_csr_iterator { | 67 | struct fw_csr_iterator { |
68 | u32 *p; | 68 | const u32 *p; |
69 | u32 *end; | 69 | const u32 *end; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | void fw_csr_iterator_init(struct fw_csr_iterator *ci, u32 *p); | 72 | void fw_csr_iterator_init(struct fw_csr_iterator *ci, const u32 *p); |
73 | int fw_csr_iterator_next(struct fw_csr_iterator *ci, int *key, int *value); | 73 | int fw_csr_iterator_next(struct fw_csr_iterator *ci, int *key, int *value); |
74 | int fw_csr_string(const u32 *directory, int key, char *buf, size_t size); | ||
74 | 75 | ||
75 | extern struct bus_type fw_bus_type; | 76 | extern struct bus_type fw_bus_type; |
76 | 77 | ||
@@ -162,7 +163,7 @@ struct fw_device { | |||
162 | struct mutex client_list_mutex; | 163 | struct mutex client_list_mutex; |
163 | struct list_head client_list; | 164 | struct list_head client_list; |
164 | 165 | ||
165 | u32 *config_rom; | 166 | const u32 *config_rom; |
166 | size_t config_rom_length; | 167 | size_t config_rom_length; |
167 | int config_rom_retries; | 168 | int config_rom_retries; |
168 | unsigned is_local:1; | 169 | unsigned is_local:1; |
@@ -204,7 +205,7 @@ int fw_device_enable_phys_dma(struct fw_device *device); | |||
204 | */ | 205 | */ |
205 | struct fw_unit { | 206 | struct fw_unit { |
206 | struct device device; | 207 | struct device device; |
207 | u32 *directory; | 208 | const u32 *directory; |
208 | struct fw_attribute_group attribute_group; | 209 | struct fw_attribute_group attribute_group; |
209 | }; | 210 | }; |
210 | 211 | ||