comedi: remove editor modelines and cruft (again)
authorMasahiro Yamada <masahiroy@kernel.org>
Mon, 10 May 2021 06:34:50 +0000 (15:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 May 2021 18:31:44 +0000 (20:31 +0200)
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>
40 files changed:
drivers/comedi/drivers/ni_routes.c
drivers/comedi/drivers/ni_routes.h
drivers/comedi/drivers/ni_routing/ni_device_routes.c
drivers/comedi/drivers/ni_routing/ni_device_routes.h
drivers/comedi/drivers/ni_routing/ni_device_routes/all.h
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
drivers/comedi/drivers/ni_routing/ni_route_values.c
drivers/comedi/drivers/ni_routing/ni_route_values.h
drivers/comedi/drivers/ni_routing/ni_route_values/all.h
drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c
drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py
drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py
drivers/comedi/drivers/ni_routing/tools/csv_collection.py
drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py
drivers/comedi/drivers/ni_routing/tools/ni_names.py
drivers/comedi/drivers/tests/comedi_example_test.c
drivers/comedi/drivers/tests/ni_routes_test.c
drivers/comedi/drivers/tests/unittest.h

index c426a9286f154e9c0340a5191bc8bd888d050f8c..1f2aa3b239a0d8ceece7bc9569b0d367840c5ce9 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routes.c
  *  Route information for NI boards.
index b7680fd2afe190ece19cb53f8bbbefdce8d74745..03698231558447520beec46d4d16d964bf87a7b7 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routes.h
  *  Route information for NI boards.
index 7b6a74dfe48bd58cb5f4086d21272be1077f9f2d..58654c2b12d6c26bb9d76f3a606486ee79350963 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes.c
  *  List of valid routes for specific NI boards.
index b9f1c47d19e17ede3e9b8f5c9c0e98e03bef0f90..09e4e172c6593c9bcfd9f05cc1345bd1322be62b 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes.c
  *  List of valid routes for specific NI boards.
index 78b24138acb7412accda75383aa4d7044b787dbf..001dbb88a874a395d881632681405252b9a11188 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/all.h
  *  List of valid routes for specific NI boards.
index f1126a0cb285861bbff88cc996537f175577634a..7d3064c9264380178a242a4f5b134bdb77cba176 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
  *  List of valid routes for specific NI boards.
index 74a59222963f0bced2fd1fb90f5ba3a594e56fe9..e2c462edb8ec98332ae0b509179b1b6685726cde 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
  *  List of valid routes for specific NI boards.
index 44dcbabf2a99e7ce009c7b03df6c3dc33ce3622d..9e02ec0a66ad1f6dc5507ebf636aca18a449b5dc 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
  *  List of valid routes for specific NI boards.
index fa5794e4e2b388b297a88f1bf29b9a59fb2fe2c0..33f7fff61f74b68ea2986c8dcc89774d0b4069f0 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
  *  List of valid routes for specific NI boards.
index 645fd1cd2de4be9e952a8fe4765f50ae4d540c4c..dde676b73624f0b3038463857169fa7100d81b68 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
  *  List of valid routes for specific NI boards.
index 056a240cd3a2768b282f31a4ec08609b51804ff1..167a2da97c14189c1d77410c1d3e6b5327e07c7c 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
  *  List of valid routes for specific NI boards.
index e0b5fa78c3bc9efb7d30c5ef5caf8fd8508f6b79..ba990f98590cbff54d0d2c3235ed535822d26201 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
  *  List of valid routes for specific NI boards.
index a2472ed288cf5f7e83e28575fb167ab56a9c626a..f8d2a91b6c0af287fb5d404965a669b158e4240c 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
  *  List of valid routes for specific NI boards.
index 91de9dac2d6af6879720a1533075574cb9d5c914..2eee91f590eb4e253a35f349cbba49fad821a934 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
  *  List of valid routes for specific NI boards.
index d378b36d20844eddc93e97fc7adb0231ccbf63e8..c07ef3584a4b6fe8d0c7d484257243971f8b5a26 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
  *  List of valid routes for specific NI boards.
index e0cc57ab06e7dbc2b49ec1b5b1e831c7c66faf36..c37373f8f0e1aa4e1498fb746475390b50d406c0 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
  *  List of valid routes for specific NI boards.
index f6e1e17ab854db16f1742d0dd1bbbad9df5c80ef..f252fbe196387b9a6c3976035db34805f9887fc5 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
  *  List of valid routes for specific NI boards.
index 9978d632117f9a51797cf4753956fbe2cf7c278c..4ccba4fdf3bce7aec0264cb7af975e27909a69b8 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
  *  List of valid routes for specific NI boards.
index 1b89e27d7aa53578e9de52d230ffb7978501a3d3..84fdfa2ef9a7c7ec9659917ec03bfbedf6afa4a5 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
  *  List of valid routes for specific NI boards.
index 10dfc34bc87c26d631d991454db0dd3ec7b9f59a..2b99ce0f87a4e235387c463cbbb32d60f46fff11 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
  *  List of valid routes for specific NI boards.
index 25db4b7363de7e2dbfc026782338838a581046a7..1c5164c46306d3580cf7d3226df5c20ee35df2a2 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
  *  List of valid routes for specific NI boards.
index 27da4433fc4a1962a93bbdf09447b2cc1efd9d39..a3402b1ca6e8426d4900c2923584ec05a899c739 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
  *  List of valid routes for specific NI boards.
index 8354fe971d59d6bd7362ea558be26cb0e487a7de..defcc4cfe1e452ce218d6179a0314d7852b5e3e7 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
  *  List of valid routes for specific NI boards.
index 2ebb679e0129a79098679d9cc745d0cfcdb03d3e..d2013b9e67676818684e734ffb11419ddc84d1b1 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
  *  List of valid routes for specific NI boards.
index d88504314d7f40c10ca99248136be76f749e5386..89aff39a4fc2620b16a1102ee4d629c27465624c 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
  *  List of valid routes for specific NI boards.
index 5901762734ed972f98c01d974d914fab31eb454a..54a740b39819e0f242d758dd12e18401fb2a576b 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values.c
  *  Route information for NI boards.
index 80e0145fb82bbeecdd79036510950f3aa4fba912..6e358efa6f7fa312ad94d5af5305f387466f67b8 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values.h
  *  Route information for NI boards.
index 7227461500b5c38cf9f86f9ef9885e75f01d92f3..30761e55f746024e3b2a3fbfa01b353b1bb68405 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values/all.h
  *  List of valid routes for specific NI boards.
index f1c7e6646261fd61abc42191bafc51f4d3e6abf9..aace60e4950712a39bcd76df4030c2851d44e428 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values/ni_660x.c
  *  Route information for NI_660X boards.
index d1ab3c9ce5857905cd7ee4bd55cb81f609864f90..7a52f024cdbdedd0e414e7e28c81f10d4edfb599 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
  *  Route information for NI_ESERIES boards.
index c59d8afe0ae9ed906b4e1f8f8af8f73094a214cb..d1ddd13b33b58c171dd47c86c4ef85d54245834a 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
  *  Route information for NI_MSERIES boards.
index dedb6f2fc678c4febc35f66af865658fd15eb186..d55521b5bdcb2dd7373f7191a8d6a976528fe040 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 
 #include <stdint.h>
 #include <stdbool.h>
index 532eb6372a5adb7e88d20f42e175ca0cd35b1864..90378fb50580a02a609bf2d4150f4f8f5606bea4 100755 (executable)
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0+
-# vim: ts=2:sw=2:et:tw=80:nowrap
 
 # This is simply to aide in creating the entries in the order of the value of
 # the device-global NI signal/terminal constants defined in comedi.h
@@ -123,7 +122,6 @@ class DeviceRoutes(CSVCollection):
 
   output_file_top = """\
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  List of valid routes for specific NI boards.
@@ -155,7 +153,6 @@ class DeviceRoutes(CSVCollection):
 
   extern_header = """\
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  List of valid routes for specific NI boards.
@@ -193,7 +190,6 @@ class DeviceRoutes(CSVCollection):
 
   single_output_file_top = """\
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  List of valid routes for specific NI boards.
@@ -299,7 +295,6 @@ class RouteValues(CSVCollection):
 
   output_file_top = """\
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  Route information for NI boards.
@@ -337,7 +332,6 @@ class RouteValues(CSVCollection):
 
   extern_header = """\
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  List of valid routes for specific NI boards.
@@ -375,7 +369,6 @@ class RouteValues(CSVCollection):
 
   single_output_file_top = """\
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/ni_routing/{filename}
  *  Route information for {sheet} boards.
index b3e6472bac2267839407898e45ecb4ba779d3138..a273b33edb8ff74e478b82fdc858379d04a43f73 100755 (executable)
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0+
-# vim: ts=2:sw=2:et:tw=80:nowrap
 
 from os import path
 import os, csv
index 12617329a928a68afe14254e05bff2ae540da6ea..db977ecb43071f00d42e5107b699ac7e43e44618 100644 (file)
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0+
-# vim: ts=2:sw=2:et:tw=80:nowrap
 
 import os, csv, glob
 
index 89c90a0ba24dfa633bc586d4fab906e5449d26f9..c00eaf803299507c6163cd38760950ac0a810112 100755 (executable)
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0+
-# vim: ts=2:sw=2:et:tw=80:nowrap
 
 from os import path
 import os, csv
index 5f9b825968b1018d0e3d7740b440b59d5299f933..d4df5f29e3e5d9284b94cdedde6ba87f39bf5917 100644 (file)
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0+
-# vim: ts=2:sw=2:et:tw=80:nowrap
 """
 This file helps to extract string names of NI signals as included in comedi.h
 between NI_NAMES_BASE and NI_NAMES_BASE+NI_NUM_NAMES.
index e5aaaeab7bdd9a5824f6160bc50c0e6a9a20ac2c..81d074bcdea5294d0f50c23518ed42b3c7b2fbef 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/tests/comedi_example_test.c
  *  Example set of unit tests.
index 32073850d545be396d8bb08afa4f2eb208b6ef66..652362486ff601f611fd84580958625a3cf46954 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/tests/ni_routes_test.c
  *  Unit tests for NI routes (ni_routes.c module).
index 2da3beea2479d3c6538eb8331b06be809c291a99..b0b34e058aad201ee213921673103bd4924979e1 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* vim: set ts=8 sw=8 noet tw=80 nowrap: */
 /*
  *  comedi/drivers/tests/unittest.h
  *  Simple framework for unittests for comedi drivers.