Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

comedi: remove editor modelines and cruft (again)

Commit fa60ce2cb450 ("treewide: remove editor modelines and cruft")
is different from what I submitted.

My original patch [1] did treewide cleanups including the comedi driver.

Unfortunately, commit 8ffdff6a8cfb ("staging: comedi: move out of staging
directory") moved drivers/staging/comedi/ to drivers/comedi/ before my
patch landed on Linus' tree from akpm tree.

If Andrew Morton had used Git, 'git merge' would have resolved such file
moves properly without any manual intervention.

Patches in akpm tree often get broken in his quilt workflows, and then
people end up with sending fixup patches.

[1] https://lkml.kernel.org/r/20210324054457.1477489-1-masahiroy@kernel.org

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210510063450.412055-1-masahiroy@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Masahiro Yamada and committed by
Greg Kroah-Hartman
7d5b2cbe 6efb943b

-46
-1
drivers/comedi/drivers/ni_routes.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routes.c 5 4 * Route information for NI boards.
-1
drivers/comedi/drivers/ni_routes.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routes.h 5 4 * Route information for NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/all.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/all.h 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6220.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6221.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6229.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6251.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6254.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6259.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6534.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6602.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6713.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6723.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pci-6733.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values.c 5 4 * Route information for NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values.h 5 4 * Route information for NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values/all.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values/all.h 5 4 * List of valid routes for specific NI boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values/ni_660x.c 5 4 * Route information for NI_660X boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values/ni_eseries.c 5 4 * Route information for NI_ESERIES boards.
-1
drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/ni_routing/ni_route_values/ni_mseries.c 5 4 * Route information for NI_MSERIES boards.
-1
drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 4 3 #include <stdint.h> 5 4 #include <stdbool.h>
-7
drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py
··· 1 1 #!/usr/bin/env python3 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 - # vim: ts=2:sw=2:et:tw=80:nowrap 4 3 5 4 # This is simply to aide in creating the entries in the order of the value of 6 5 # the device-global NI signal/terminal constants defined in comedi.h ··· 122 123 123 124 output_file_top = """\ 124 125 // SPDX-License-Identifier: GPL-2.0+ 125 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 126 126 /* 127 127 * comedi/drivers/ni_routing/{filename} 128 128 * List of valid routes for specific NI boards. ··· 153 155 154 156 extern_header = """\ 155 157 /* SPDX-License-Identifier: GPL-2.0+ */ 156 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 157 158 /* 158 159 * comedi/drivers/ni_routing/{filename} 159 160 * List of valid routes for specific NI boards. ··· 190 193 191 194 single_output_file_top = """\ 192 195 // SPDX-License-Identifier: GPL-2.0+ 193 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 194 196 /* 195 197 * comedi/drivers/ni_routing/{filename} 196 198 * List of valid routes for specific NI boards. ··· 295 299 296 300 output_file_top = """\ 297 301 // SPDX-License-Identifier: GPL-2.0+ 298 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 299 302 /* 300 303 * comedi/drivers/ni_routing/{filename} 301 304 * Route information for NI boards. ··· 332 337 333 338 extern_header = """\ 334 339 /* SPDX-License-Identifier: GPL-2.0+ */ 335 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 336 340 /* 337 341 * comedi/drivers/ni_routing/{filename} 338 342 * List of valid routes for specific NI boards. ··· 369 375 370 376 single_output_file_top = """\ 371 377 // SPDX-License-Identifier: GPL-2.0+ 372 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 373 378 /* 374 379 * comedi/drivers/ni_routing/{filename} 375 380 * Route information for {sheet} boards.
-1
drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py
··· 1 1 #!/usr/bin/env python3 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 - # vim: ts=2:sw=2:et:tw=80:nowrap 4 3 5 4 from os import path 6 5 import os, csv
-1
drivers/comedi/drivers/ni_routing/tools/csv_collection.py
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ 2 - # vim: ts=2:sw=2:et:tw=80:nowrap 3 2 4 3 import os, csv, glob 5 4
-1
drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py
··· 1 1 #!/usr/bin/env python3 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 - # vim: ts=2:sw=2:et:tw=80:nowrap 4 3 5 4 from os import path 6 5 import os, csv
-1
drivers/comedi/drivers/ni_routing/tools/ni_names.py
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ 2 - # vim: ts=2:sw=2:et:tw=80:nowrap 3 2 """ 4 3 This file helps to extract string names of NI signals as included in comedi.h 5 4 between NI_NAMES_BASE and NI_NAMES_BASE+NI_NUM_NAMES.
-1
drivers/comedi/drivers/tests/comedi_example_test.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/tests/comedi_example_test.c 5 4 * Example set of unit tests.
-1
drivers/comedi/drivers/tests/ni_routes_test.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/tests/ni_routes_test.c 5 4 * Unit tests for NI routes (ni_routes.c module).
-1
drivers/comedi/drivers/tests/unittest.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* vim: set ts=8 sw=8 noet tw=80 nowrap: */ 3 2 /* 4 3 * comedi/drivers/tests/unittest.h 5 4 * Simple framework for unittests for comedi drivers.