Skip to content

Commit 20f1648

Browse files
committed
Merge tag 'clang-format-for-linus-v5.7-rc3' of git://github.com/ojeda/linux
Pull clang-format fixlets from Miguel Ojeda: "Two trivial clang-format changes: - Don't indent C++ namespaces (Ian Rogers) - The usual clang-format macro list update (Miguel Ojeda)" * tag 'clang-format-for-linus-v5.7-rc3' of git://github.com/ojeda/linux: clang-format: Update with the latest for_each macro list clang-format: don't indent namespaces
2 parents ae83d0b + 5d65a02 commit 20f1648

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

.clang-format

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,13 @@ ForEachMacros:
142142
- 'for_each_card_auxs'
143143
- 'for_each_card_auxs_safe'
144144
- 'for_each_card_components'
145+
- 'for_each_card_dapms'
145146
- 'for_each_card_pre_auxs'
146147
- 'for_each_card_prelinks'
147148
- 'for_each_card_rtds'
148149
- 'for_each_card_rtds_safe'
150+
- 'for_each_card_widgets'
151+
- 'for_each_card_widgets_safe'
149152
- 'for_each_cgroup_storage_type'
150153
- 'for_each_child_of_node'
151154
- 'for_each_clear_bit'
@@ -160,6 +163,7 @@ ForEachMacros:
160163
- 'for_each_cpu_and'
161164
- 'for_each_cpu_not'
162165
- 'for_each_cpu_wrap'
166+
- 'for_each_dapm_widgets'
163167
- 'for_each_dev_addr'
164168
- 'for_each_dev_scope'
165169
- 'for_each_displayid_db'
@@ -170,7 +174,6 @@ ForEachMacros:
170174
- 'for_each_dpcm_fe'
171175
- 'for_each_drhd_unit'
172176
- 'for_each_dss_dev'
173-
- 'for_each_efi_handle'
174177
- 'for_each_efi_memory_desc'
175178
- 'for_each_efi_memory_desc_in_map'
176179
- 'for_each_element'
@@ -191,6 +194,7 @@ ForEachMacros:
191194
- 'for_each_ip_tunnel_rcu'
192195
- 'for_each_irq_nr'
193196
- 'for_each_link_codecs'
197+
- 'for_each_link_cpus'
194198
- 'for_each_link_platforms'
195199
- 'for_each_lru'
196200
- 'for_each_matching_node'
@@ -250,6 +254,7 @@ ForEachMacros:
250254
- 'for_each_pci_bridge'
251255
- 'for_each_pci_dev'
252256
- 'for_each_pci_msi_entry'
257+
- 'for_each_pcm_streams'
253258
- 'for_each_populated_zone'
254259
- 'for_each_possible_cpu'
255260
- 'for_each_present_cpu'
@@ -260,9 +265,12 @@ ForEachMacros:
260265
- 'for_each_property_of_node'
261266
- 'for_each_registered_fb'
262267
- 'for_each_reserved_mem_region'
263-
- 'for_each_rtd_codec_dai'
264-
- 'for_each_rtd_codec_dai_rollback'
268+
- 'for_each_rtd_codec_dais'
269+
- 'for_each_rtd_codec_dais_rollback'
265270
- 'for_each_rtd_components'
271+
- 'for_each_rtd_cpu_dais'
272+
- 'for_each_rtd_cpu_dais_rollback'
273+
- 'for_each_rtd_dais'
266274
- 'for_each_set_bit'
267275
- 'for_each_set_bit_from'
268276
- 'for_each_set_clump8'
@@ -334,6 +342,7 @@ ForEachMacros:
334342
- 'klp_for_each_object'
335343
- 'klp_for_each_object_safe'
336344
- 'klp_for_each_object_static'
345+
- 'kunit_suite_for_each_test_case'
337346
- 'kvm_for_each_memslot'
338347
- 'kvm_for_each_vcpu'
339348
- 'list_for_each'
@@ -387,6 +396,7 @@ ForEachMacros:
387396
- 'of_property_for_each_string'
388397
- 'of_property_for_each_u32'
389398
- 'pci_bus_for_each_resource'
399+
- 'pcm_for_each_format'
390400
- 'ping_portaddr_for_each_entry'
391401
- 'plist_for_each'
392402
- 'plist_for_each_continue'
@@ -482,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
482492
MacroBlockBegin: ''
483493
MacroBlockEnd: ''
484494
MaxEmptyLinesToKeep: 1
485-
NamespaceIndentation: Inner
495+
NamespaceIndentation: None
486496
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
487497
ObjCBlockIndentWidth: 8
488498
ObjCSpaceAfterProperty: true

0 commit comments

Comments
 (0)