History

comedi: Move the main COMEDI headers

Move the main COMEDI driver headers out of "drivers/comedi/" into new directory "include/linux/comedi/". These are "comedidev.h", "comedilib.h", "comedi_pci.h", "comedi_pcmcia.h", and "comedi_usb.h". Additionally, move the user-space API header "comedi.h" into "include/uapi/linux/" and add "WITH Linux-syscall-note" to its SPDX-License-Identifier. Update the "COMEDI DRIVERS" section of the MAINTAINERS file to account for these changes.

Ian Abbott committed 4 years ago

Commit df0e68c1 parent b4c8062146 files · +150 −252Browse files

Unified · Split

146 files
  1. MAINTAINERS +2 −0
  2. drivers/comedi/comedi_buf.c +1 −2
  3. drivers/comedi/comedi_fops.c +1 −1
  4. drivers/comedi/comedi_pci.c +1 −2
  5. drivers/comedi/comedi_pcmcia.c +1 −2
  6. drivers/comedi/comedi_usb.c +1 −2
  7. drivers/comedi/drivers.c +1 −2
  8. drivers/comedi/drivers/8255.c +1 −1
  9. drivers/comedi/drivers/8255_pci.c +1 −2
  10. drivers/comedi/drivers/addi_apci_1032.c +1 −1
  11. drivers/comedi/drivers/addi_apci_1500.c +1 −1
  12. drivers/comedi/drivers/addi_apci_1516.c +1 −1
  13. drivers/comedi/drivers/addi_apci_1564.c +1 −1
  14. drivers/comedi/drivers/addi_apci_16xx.c +1 −2
  15. drivers/comedi/drivers/addi_apci_2032.c +1 −1
  16. drivers/comedi/drivers/addi_apci_2200.c +1 −1
  17. drivers/comedi/drivers/addi_apci_3120.c +1 −1
  18. drivers/comedi/drivers/addi_apci_3501.c +1 −1
  19. drivers/comedi/drivers/addi_apci_3xxx.c +1 −2
  20. drivers/comedi/drivers/addi_watchdog.c +1 −1
  21. drivers/comedi/drivers/adl_pci6208.c +1 −2
  22. drivers/comedi/drivers/adl_pci7x3x.c +1 −2
  23. drivers/comedi/drivers/adl_pci8164.c +1 −2
  24. drivers/comedi/drivers/adl_pci9111.c +1 −2
  25. drivers/comedi/drivers/adl_pci9118.c +1 −2
  26. drivers/comedi/drivers/adq12b.c +1 −2
  27. drivers/comedi/drivers/adv_pci1710.c +1 −2
  28. drivers/comedi/drivers/adv_pci1720.c +1 −2
  29. drivers/comedi/drivers/adv_pci1723.c +1 −2
  30. drivers/comedi/drivers/adv_pci1724.c +1 −2
  31. drivers/comedi/drivers/adv_pci1760.c +1 −2
  32. drivers/comedi/drivers/adv_pci_dio.c +1 −2
  33. drivers/comedi/drivers/aio_aio12_8.c +1 −1
  34. drivers/comedi/drivers/aio_iiro_16.c +1 −2
  35. drivers/comedi/drivers/amplc_dio200.c +1 −1
  36. drivers/comedi/drivers/amplc_dio200_common.c +1 −2
  37. drivers/comedi/drivers/amplc_dio200_pci.c +1 −2
  38. drivers/comedi/drivers/amplc_pc236.c +1 −2
  39. drivers/comedi/drivers/amplc_pc236_common.c +1 −2
  40. drivers/comedi/drivers/amplc_pc263.c +1 −1
  41. drivers/comedi/drivers/amplc_pci224.c +1 −2
  42. drivers/comedi/drivers/amplc_pci230.c +1 −2
  43. drivers/comedi/drivers/amplc_pci236.c +1 −2
  44. drivers/comedi/drivers/amplc_pci263.c +1 −2
  45. drivers/comedi/drivers/c6xdigio.c +1 −2
  46. drivers/comedi/drivers/cb_das16_cs.c +1 −2
  47. drivers/comedi/drivers/cb_pcidas.c +1 −2
  48. drivers/comedi/drivers/cb_pcidas64.c +1 −2
  49. drivers/comedi/drivers/cb_pcidda.c +1 −2
  50. drivers/comedi/drivers/cb_pcimdas.c +1 −2
  51. drivers/comedi/drivers/cb_pcimdda.c +1 −2
  52. drivers/comedi/drivers/comedi_8254.c +1 −2
  53. drivers/comedi/drivers/comedi_8255.c +1 −1
  54. drivers/comedi/drivers/comedi_bond.c +3 −3
  55. drivers/comedi/drivers/comedi_isadma.c +1 −2
  56. drivers/comedi/drivers/comedi_parport.c +1 −2
  57. drivers/comedi/drivers/comedi_test.c +1 −3
  58. drivers/comedi/drivers/contec_pci_dio.c +1 −2
  59. drivers/comedi/drivers/dac02.c +1 −2
  60. drivers/comedi/drivers/daqboard2000.c +1 −2
  61. drivers/comedi/drivers/das08.c +1 −2
  62. drivers/comedi/drivers/das08_cs.c +1 −2
  63. drivers/comedi/drivers/das08_isa.c +1 −1
  64. drivers/comedi/drivers/das08_pci.c +1 −2
  65. drivers/comedi/drivers/das16.c +1 −2
  66. drivers/comedi/drivers/das16m1.c +1 −1
  67. drivers/comedi/drivers/das1800.c +1 −2
  68. drivers/comedi/drivers/das6402.c +1 −2
  69. drivers/comedi/drivers/das800.c +1 −2
  70. drivers/comedi/drivers/dmm32at.c +1 −1
  71. drivers/comedi/drivers/dt2801.c +1 −1
  72. drivers/comedi/drivers/dt2811.c +1 −2
  73. drivers/comedi/drivers/dt2814.c +1 −2
  74. drivers/comedi/drivers/dt2815.c +1 −2
  75. drivers/comedi/drivers/dt2817.c +1 −1
  76. drivers/comedi/drivers/dt282x.c +1 −2
  77. drivers/comedi/drivers/dt3000.c +1 −2
  78. drivers/comedi/drivers/dt9812.c +1 −2
  79. drivers/comedi/drivers/dyna_pci10xx.c +1 −2
  80. drivers/comedi/drivers/fl512.c +1 −2
  81. drivers/comedi/drivers/gsc_hpdi.c +1 −2
  82. drivers/comedi/drivers/icp_multi.c +1 −2
  83. drivers/comedi/drivers/ii_pci20kc.c +1 −1
  84. drivers/comedi/drivers/jr3_pci.c +1 −2
  85. drivers/comedi/drivers/ke_counter.c +1 −2
  86. drivers/comedi/drivers/me4000.c +1 −2
  87. drivers/comedi/drivers/me_daq.c +1 −2
  88. drivers/comedi/drivers/mf6x4.c +1 −2
  89. drivers/comedi/drivers/mite.c +1 −2
  90. drivers/comedi/drivers/mpc624.c +1 −2
  91. drivers/comedi/drivers/multiq3.c +1 −2
  92. drivers/comedi/drivers/ni_6527.c +1 −2
  93. drivers/comedi/drivers/ni_65xx.c +1 −2
  94. drivers/comedi/drivers/ni_660x.c +1 −2
  95. drivers/comedi/drivers/ni_670x.c +1 −2
  96. drivers/comedi/drivers/ni_at_a2150.c +1 −2
  97. drivers/comedi/drivers/ni_at_ao.c +1 −2
  98. drivers/comedi/drivers/ni_atmio.c +1 −2
  99. drivers/comedi/drivers/ni_atmio16d.c +1 −1
  100. drivers/comedi/drivers/ni_daq_700.c +1 −2
  101. drivers/comedi/drivers/ni_daq_dio24.c +1 −1
  102. drivers/comedi/drivers/ni_labpc.c +1 −2
  103. drivers/comedi/drivers/ni_labpc_common.c +1 −2
  104. drivers/comedi/drivers/ni_labpc_cs.c +1 −2
  105. drivers/comedi/drivers/ni_labpc_isadma.c +1 −2
  106. drivers/comedi/drivers/ni_labpc_pci.c +1 −2
  107. drivers/comedi/drivers/ni_mio_cs.c +1 −1
  108. drivers/comedi/drivers/ni_pcidio.c +1 −2
  109. drivers/comedi/drivers/ni_pcimio.c +1 −3
  110. drivers/comedi/drivers/ni_routes.c +1 −2
  111. drivers/comedi/drivers/ni_routes.h +1 −1
  112. drivers/comedi/drivers/ni_routing/ni_route_values.h +1 −1
  113. drivers/comedi/drivers/ni_tio.h +1 −1
  114. drivers/comedi/drivers/ni_usb6501.c +1 −2
  115. drivers/comedi/drivers/pcl711.c +1 −2
  116. drivers/comedi/drivers/pcl724.c +1 −1
  117. drivers/comedi/drivers/pcl726.c +1 −2
  118. drivers/comedi/drivers/pcl730.c +1 −1
  119. drivers/comedi/drivers/pcl812.c +1 −2
  120. drivers/comedi/drivers/pcl816.c +1 −2
  121. drivers/comedi/drivers/pcl818.c +1 −2
  122. drivers/comedi/drivers/pcm3724.c +1 −1
  123. drivers/comedi/drivers/pcmad.c +1 −1
  124. drivers/comedi/drivers/pcmda12.c +1 −1
  125. drivers/comedi/drivers/pcmmio.c +1 −2
  126. drivers/comedi/drivers/pcmuio.c +1 −2
  127. drivers/comedi/drivers/quatech_daqp_cs.c +1 −2
  128. drivers/comedi/drivers/rtd520.c +1 −2
  129. drivers/comedi/drivers/rti800.c +1 −1
  130. drivers/comedi/drivers/rti802.c +1 −1
  131. drivers/comedi/drivers/s526.c +1 −1
  132. drivers/comedi/drivers/s626.c +1 −2
  133. drivers/comedi/drivers/ssv_dnp.c +1 −1
  134. drivers/comedi/drivers/usbdux.c +1 −2
  135. drivers/comedi/drivers/usbduxfast.c +1 −1
  136. drivers/comedi/drivers/usbduxsigma.c +1 −2
  137. drivers/comedi/drivers/vmk80xx.c +1 −2
  138. drivers/comedi/kcomedilib/kcomedilib_main.c +3 −3
  139. drivers/comedi/proc.c +1 −1
  140. drivers/comedi/range.c +1 −1
  141. include/linux/comedi/comedi_pci.h +1 −2
  142. include/linux/comedi/comedi_pcmcia.h +1 −2
  143. include/linux/comedi/comedi_usb.h +1 −2
  144. include/linux/comedi/comedidev.h +1 −2
  145. include/linux/comedi/comedilib.h +0 −0
  146. include/uapi/linux/comedi.h +1 −1
MAINTAINERS+2−0
@@ -4713,6 +4713,8 @@ M: Ian Abbott <abbotti@mev.co.uk> · 4712 unmodified lines
47134713 M: H Hartley Sweeten <hsweeten@visionengravers.com>
47144714 S: Odd Fixes
47154715 F: drivers/comedi/
4716+F: include/linux/comedi/
4717+F: include/uapi/linux/comedi.h
47164718
47174719 COMMON CLK FRAMEWORK
47184720 M: Michael Turquette <mturquette@baylibre.com>
drivers/comedi/comedi_buf.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/vmalloc.h>
1111 #include <linux/slab.h>
12−
13−#include "comedidev.h"
12+#include <linux/comedi/comedidev.h>
1413 #include "comedi_internal.h"
1514
1615 #ifdef PAGE_KERNEL_NOCACHE
drivers/comedi/comedi_fops.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/poll.h>
2424 #include <linux/device.h>
2525 #include <linux/fs.h>
26−#include "comedidev.h"
26+#include <linux/comedi/comedidev.h>
2727 #include <linux/cdev.h>
2828
2929 #include <linux/io.h>
drivers/comedi/comedi_pci.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/module.h>
1111 #include <linux/interrupt.h>
12−
13−#include "comedi_pci.h"
12+#include <linux/comedi/comedi_pci.h>
1413
1514 /**
1615 * comedi_to_pci_dev() - Return PCI device attached to COMEDI device
drivers/comedi/comedi_pcmcia.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/module.h>
1111 #include <linux/kernel.h>
12−
13−#include "comedi_pcmcia.h"
12+#include <linux/comedi/comedi_pcmcia.h>
1413
1514 /**
1615 * comedi_to_pcmcia_dev() - Return PCMCIA device attached to COMEDI device
drivers/comedi/comedi_usb.c+1−2
@@ -8,8 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/module.h>
11−
12−#include "comedi_usb.h"
11+#include <linux/comedi/comedi_usb.h>
1312
1413 /**
1514 * comedi_to_usb_interface() - Return USB interface attached to COMEDI device
drivers/comedi/drivers.c+1−2
@@ -17,8 +17,7 @@ · 16 unmodified lines
1717 #include <linux/dma-direction.h>
1818 #include <linux/interrupt.h>
1919 #include <linux/firmware.h>
20−
21−#include "comedidev.h"
20+#include <linux/comedi/comedidev.h>
2221 #include "comedi_internal.h"
2322
2423 struct comedi_driver *comedi_drivers;
drivers/comedi/drivers/8255.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 */
4141
4242 #include <linux/module.h>
43−#include "../comedidev.h"
43+#include <linux/comedi/comedidev.h>
4444
4545 #include "8255.h"
4646
drivers/comedi/drivers/8255_pci.c+1−2
@@ -53,8 +53,7 @@ · 52 unmodified lines
5353 */
5454
5555 #include <linux/module.h>
56−
57−#include "../comedi_pci.h"
56+#include <linux/comedi/comedi_pci.h>
5857
5958 #include "8255.h"
6059
drivers/comedi/drivers/addi_apci_1032.c+1−1
@@ -63,8 +63,8 @@ · 62 unmodified lines
6363
6464 #include <linux/module.h>
6565 #include <linux/interrupt.h>
66+#include <linux/comedi/comedi_pci.h>
6667
67−#include "../comedi_pci.h"
6868 #include "amcc_s5933.h"
6969
7070 /*
drivers/comedi/drivers/addi_apci_1500.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414
1515 #include <linux/module.h>
1616 #include <linux/interrupt.h>
17+#include <linux/comedi/comedi_pci.h>
1718
18−#include "../comedi_pci.h"
1919 #include "amcc_s5933.h"
2020 #include "z8536.h"
2121
drivers/comedi/drivers/addi_apci_1516.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 */
1515
1616 #include <linux/module.h>
17+#include <linux/comedi/comedi_pci.h>
1718
18−#include "../comedi_pci.h"
1919 #include "addi_watchdog.h"
2020
2121 /*
drivers/comedi/drivers/addi_apci_1564.c+1−1
@@ -68,8 +68,8 @@ · 67 unmodified lines
6868
6969 #include <linux/module.h>
7070 #include <linux/interrupt.h>
71+#include <linux/comedi/comedi_pci.h>
7172
72−#include "../comedi_pci.h"
7373 #include "addi_tcw.h"
7474 #include "addi_watchdog.h"
7575
drivers/comedi/drivers/addi_apci_16xx.c+1−2
@@ -14,8 +14,7 @@ · 13 unmodified lines
1414 */
1515
1616 #include <linux/module.h>
17−
18−#include "../comedi_pci.h"
17+#include <linux/comedi/comedi_pci.h>
1918
2019 /*
2120 * Register I/O map
drivers/comedi/drivers/addi_apci_2032.c+1−1
@@ -16,8 +16,8 @@ · 15 unmodified lines
1616 #include <linux/module.h>
1717 #include <linux/interrupt.h>
1818 #include <linux/slab.h>
19+#include <linux/comedi/comedi_pci.h>
1920
20−#include "../comedi_pci.h"
2121 #include "addi_watchdog.h"
2222
2323 /*
drivers/comedi/drivers/addi_apci_2200.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 */
1515
1616 #include <linux/module.h>
17+#include <linux/comedi/comedi_pci.h>
1718
18−#include "../comedi_pci.h"
1919 #include "addi_watchdog.h"
2020
2121 /*
drivers/comedi/drivers/addi_apci_3120.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414
1515 #include <linux/module.h>
1616 #include <linux/interrupt.h>
17+#include <linux/comedi/comedi_pci.h>
1718
18−#include "../comedi_pci.h"
1919 #include "amcc_s5933.h"
2020
2121 /*
drivers/comedi/drivers/addi_apci_3501.c+1−1
@@ -41,8 +41,8 @@ · 40 unmodified lines
4141 */
4242
4343 #include <linux/module.h>
44+#include <linux/comedi/comedi_pci.h>
4445
45−#include "../comedi_pci.h"
4646 #include "amcc_s5933.h"
4747
4848 /*
drivers/comedi/drivers/addi_apci_3xxx.c+1−2
@@ -15,8 +15,7 @@ · 14 unmodified lines
1515
1616 #include <linux/module.h>
1717 #include <linux/interrupt.h>
18−
19−#include "../comedi_pci.h"
18+#include <linux/comedi/comedi_pci.h>
2019
2120 #define CONV_UNIT_NS BIT(0)
2221 #define CONV_UNIT_US BIT(1)
drivers/comedi/drivers/addi_watchdog.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 */
1111
1212 #include <linux/module.h>
13−#include "../comedidev.h"
13+#include <linux/comedi/comedidev.h>
1414 #include "addi_tcw.h"
1515 #include "addi_watchdog.h"
1616
drivers/comedi/drivers/adl_pci6208.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424
2525 #include <linux/module.h>
2626 #include <linux/delay.h>
27−
28−#include "../comedi_pci.h"
27+#include <linux/comedi/comedi_pci.h>
2928
3029 /*
3130 * PCI-6208/6216-GL register map
drivers/comedi/drivers/adl_pci7x3x.c+1−2
@@ -46,8 +46,7 @@ · 45 unmodified lines
4646 */
4747
4848 #include <linux/module.h>
49−
50−#include "../comedi_pci.h"
49+#include <linux/comedi/comedi_pci.h>
5150
5251 #include "plx9052.h"
5352
drivers/comedi/drivers/adl_pci8164.c+1−2
@@ -19,8 +19,7 @@ · 18 unmodified lines
1919
2020 #include <linux/kernel.h>
2121 #include <linux/module.h>
22−
23−#include "../comedi_pci.h"
22+#include <linux/comedi/comedi_pci.h>
2423
2524 #define PCI8164_AXIS(x) ((x) * 0x08)
2625 #define PCI8164_CMD_MSTS_REG 0x00
drivers/comedi/drivers/adl_pci9111.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
4242 #include <linux/module.h>
4343 #include <linux/delay.h>
4444 #include <linux/interrupt.h>
45−
46−#include "../comedi_pci.h"
45+#include <linux/comedi/comedi_pci.h>
4746
4847 #include "plx9052.h"
4948 #include "comedi_8254.h"
drivers/comedi/drivers/adl_pci9118.c+1−2
@@ -78,8 +78,7 @@ · 77 unmodified lines
7878 #include <linux/gfp.h>
7979 #include <linux/interrupt.h>
8080 #include <linux/io.h>
81−
82−#include "../comedi_pci.h"
81+#include <linux/comedi/comedi_pci.h>
8382
8483 #include "amcc_s5933.h"
8584 #include "comedi_8254.h"
drivers/comedi/drivers/adq12b.c+1−2
@@ -48,8 +48,7 @@ · 47 unmodified lines
4848
4949 #include <linux/module.h>
5050 #include <linux/delay.h>
51−
52−#include "../comedidev.h"
51+#include <linux/comedi/comedidev.h>
5352
5453 /* address scheme (page 2.17 of the manual) */
5554 #define ADQ12B_CTREG 0x00
drivers/comedi/drivers/adv_pci1710.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
3030
3131 #include <linux/module.h>
3232 #include <linux/interrupt.h>
33−
34−#include "../comedi_pci.h"
33+#include <linux/comedi/comedi_pci.h>
3534
3635 #include "comedi_8254.h"
3736 #include "amcc_s5933.h"
drivers/comedi/drivers/adv_pci1720.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
4242
4343 #include <linux/module.h>
4444 #include <linux/delay.h>
45−
46−#include "../comedi_pci.h"
45+#include <linux/comedi/comedi_pci.h>
4746
4847 /*
4948 * PCI BAR2 Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1723.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
3232 */
3333
3434 #include <linux/module.h>
35−
36−#include "../comedi_pci.h"
35+#include <linux/comedi/comedi_pci.h>
3736
3837 /*
3938 * PCI Bar 2 I/O Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1724.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
3838 */
3939
4040 #include <linux/module.h>
41−
42−#include "../comedi_pci.h"
41+#include <linux/comedi/comedi_pci.h>
4342
4443 /*
4544 * PCI bar 2 Register I/O map (dev->iobase)
drivers/comedi/drivers/adv_pci1760.c+1−2
@@ -22,8 +22,7 @@ · 21 unmodified lines
2222 */
2323
2424 #include <linux/module.h>
25−
26−#include "../comedi_pci.h"
25+#include <linux/comedi/comedi_pci.h>
2726
2827 /*
2928 * PCI-1760 Register Map
drivers/comedi/drivers/adv_pci_dio.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
2323
2424 #include <linux/module.h>
2525 #include <linux/delay.h>
26−
27−#include "../comedi_pci.h"
26+#include <linux/comedi/comedi_pci.h>
2827
2928 #include "8255.h"
3029 #include "comedi_8254.h"
drivers/comedi/drivers/aio_aio12_8.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 */
2323
2424 #include <linux/module.h>
25−#include "../comedidev.h"
25+#include <linux/comedi/comedidev.h>
2626
2727 #include "comedi_8254.h"
2828 #include "8255.h"
drivers/comedi/drivers/aio_iiro_16.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
3030
3131 #include <linux/module.h>
3232 #include <linux/interrupt.h>
33−
34−#include "../comedidev.h"
33+#include <linux/comedi/comedidev.h>
3534
3635 #define AIO_IIRO_16_RELAY_0_7 0x00
3736 #define AIO_IIRO_16_INPUT_0_7 0x01
drivers/comedi/drivers/amplc_dio200.c+1−1
@@ -185,7 +185,7 @@ · 184 unmodified lines
185185 */
186186
187187 #include <linux/module.h>
188−#include "../comedidev.h"
188+#include <linux/comedi/comedidev.h>
189189
190190 #include "amplc_dio200.h"
191191
drivers/comedi/drivers/amplc_dio200_common.c+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
1212
1313 #include <linux/module.h>
1414 #include <linux/interrupt.h>
15−
16−#include "../comedidev.h"
15+#include <linux/comedi/comedidev.h>
1716
1817 #include "amplc_dio200.h"
1918 #include "comedi_8254.h"
drivers/comedi/drivers/amplc_dio200_pci.c+1−2
@@ -214,8 +214,7 @@ · 213 unmodified lines
214214
215215 #include <linux/module.h>
216216 #include <linux/interrupt.h>
217−
218−#include "../comedi_pci.h"
217+#include <linux/comedi/comedi_pci.h>
219218
220219 #include "amplc_dio200.h"
221220
drivers/comedi/drivers/amplc_pc236.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
3232 */
3333
3434 #include <linux/module.h>
35−
36−#include "../comedidev.h"
35+#include <linux/comedi/comedidev.h>
3736
3837 #include "amplc_pc236.h"
3938
drivers/comedi/drivers/amplc_pc236_common.c+1−2
@@ -11,8 +11,7 @@ · 10 unmodified lines
1111
1212 #include <linux/module.h>
1313 #include <linux/interrupt.h>
14−
15−#include "../comedidev.h"
14+#include <linux/comedi/comedidev.h>
1615
1716 #include "amplc_pc236.h"
1817 #include "8255.h"
drivers/comedi/drivers/amplc_pc263.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
2929
3030 /* PC263 registers */
3131 #define PC263_DO_0_7_REG 0x00
drivers/comedi/drivers/amplc_pci224.c+1−2
@@ -96,8 +96,7 @@ · 95 unmodified lines
9696 #include <linux/module.h>
9797 #include <linux/interrupt.h>
9898 #include <linux/slab.h>
99−
100−#include "../comedi_pci.h"
99+#include <linux/comedi/comedi_pci.h>
101100
102101 #include "comedi_8254.h"
103102
drivers/comedi/drivers/amplc_pci230.c+1−2
@@ -174,8 +174,7 @@ · 173 unmodified lines
174174 #include <linux/module.h>
175175 #include <linux/delay.h>
176176 #include <linux/interrupt.h>
177−
178−#include "../comedi_pci.h"
177+#include <linux/comedi/comedi_pci.h>
179178
180179 #include "comedi_8254.h"
181180 #include "8255.h"
drivers/comedi/drivers/amplc_pci236.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
3434
3535 #include <linux/module.h>
3636 #include <linux/interrupt.h>
37−
38−#include "../comedi_pci.h"
37+#include <linux/comedi/comedi_pci.h>
3938
4039 #include "amplc_pc236.h"
4140 #include "plx9052.h"
drivers/comedi/drivers/amplc_pci263.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424 */
2525
2626 #include <linux/module.h>
27−
28−#include "../comedi_pci.h"
27+#include <linux/comedi/comedi_pci.h>
2928
3029 /* PCI263 registers */
3130 #define PCI263_DO_0_7_REG 0x00
drivers/comedi/drivers/c6xdigio.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
3030 #include <linux/timer.h>
3131 #include <linux/io.h>
3232 #include <linux/pnp.h>
33−
34−#include "../comedidev.h"
33+#include <linux/comedi/comedidev.h>
3534
3635 /*
3736 * Register I/O map
drivers/comedi/drivers/cb_das16_cs.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
2727 #include <linux/module.h>
2828 #include <linux/interrupt.h>
2929 #include <linux/delay.h>
30−
31−#include "../comedi_pcmcia.h"
30+#include <linux/comedi/comedi_pcmcia.h>
3231
3332 #include "comedi_8254.h"
3433
drivers/comedi/drivers/cb_pcidas.c+1−2
@@ -54,8 +54,7 @@ · 53 unmodified lines
5454 #include <linux/module.h>
5555 #include <linux/delay.h>
5656 #include <linux/interrupt.h>
57−
58−#include "../comedi_pci.h"
57+#include <linux/comedi/comedi_pci.h>
5958
6059 #include "comedi_8254.h"
6160 #include "8255.h"
drivers/comedi/drivers/cb_pcidas64.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
7373 #include <linux/module.h>
7474 #include <linux/delay.h>
7575 #include <linux/interrupt.h>
76−
77−#include "../comedi_pci.h"
76+#include <linux/comedi/comedi_pci.h>
7877
7978 #include "8255.h"
8079 #include "plx9080.h"
drivers/comedi/drivers/cb_pcidda.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
2727 */
2828
2929 #include <linux/module.h>
30−
31−#include "../comedi_pci.h"
30+#include <linux/comedi/comedi_pci.h>
3231
3332 #include "8255.h"
3433
drivers/comedi/drivers/cb_pcimdas.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
3434
3535 #include <linux/module.h>
3636 #include <linux/interrupt.h>
37−
38−#include "../comedi_pci.h"
37+#include <linux/comedi/comedi_pci.h>
3938
4039 #include "comedi_8254.h"
4140 #include "plx9052.h"
drivers/comedi/drivers/cb_pcimdda.c+1−2
@@ -67,8 +67,7 @@ · 66 unmodified lines
6767 */
6868
6969 #include <linux/module.h>
70−
71−#include "../comedi_pci.h"
70+#include <linux/comedi/comedi_pci.h>
7271
7372 #include "8255.h"
7473
drivers/comedi/drivers/comedi_8254.c+1−2
@@ -116,8 +116,7 @@ · 115 unmodified lines
116116 #include <linux/module.h>
117117 #include <linux/slab.h>
118118 #include <linux/io.h>
119−
120−#include "../comedidev.h"
119+#include <linux/comedi/comedidev.h>
121120
122121 #include "comedi_8254.h"
123122
drivers/comedi/drivers/comedi_8255.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 */
3030
3131 #include <linux/module.h>
32−#include "../comedidev.h"
32+#include <linux/comedi/comedidev.h>
3333
3434 #include "8255.h"
3535
drivers/comedi/drivers/comedi_bond.c+3−3
@@ -40,9 +40,9 @@ · 39 unmodified lines
4040 #include <linux/module.h>
4141 #include <linux/string.h>
4242 #include <linux/slab.h>
43−#include "../comedi.h"
44−#include "../comedilib.h"
45−#include "../comedidev.h"
43+#include <linux/comedi.h>
44+#include <linux/comedi/comedilib.h>
45+#include <linux/comedi/comedidev.h>
4646
4747 struct bonded_device {
4848 struct comedi_device *dev;
drivers/comedi/drivers/comedi_isadma.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
99 #include <linux/delay.h>
1010 #include <linux/dma-mapping.h>
1111 #include <asm/dma.h>
12−
13−#include "../comedidev.h"
12+#include <linux/comedi/comedidev.h>
1413
1514 #include "comedi_isadma.h"
1615
drivers/comedi/drivers/comedi_parport.c+1−2
@@ -57,8 +57,7 @@ · 56 unmodified lines
5757
5858 #include <linux/module.h>
5959 #include <linux/interrupt.h>
60−
61−#include "../comedidev.h"
60+#include <linux/comedi/comedidev.h>
6261
6362 /*
6463 * Register map
drivers/comedi/drivers/comedi_test.c+1−3
@@ -45,10 +45,8 @@ · 44 unmodified lines
4545 */
4646
4747 #include <linux/module.h>
48−#include "../comedidev.h"
49−
48+#include <linux/comedi/comedidev.h>
5049 #include <asm/div64.h>
51−
5250 #include <linux/timer.h>
5351 #include <linux/ktime.h>
5452 #include <linux/jiffies.h>
drivers/comedi/drivers/contec_pci_dio.c+1−2
@@ -18,8 +18,7 @@ · 17 unmodified lines
1818 */
1919
2020 #include <linux/module.h>
21−
22−#include "../comedi_pci.h"
21+#include <linux/comedi/comedi_pci.h>
2322
2423 /*
2524 * Register map
drivers/comedi/drivers/dac02.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−
29−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
3029
3130 /*
3231 * The output range is selected by jumpering pins on the I/O connector.
drivers/comedi/drivers/daqboard2000.c+1−2
@@ -96,8 +96,7 @@ · 95 unmodified lines
9696 #include <linux/module.h>
9797 #include <linux/delay.h>
9898 #include <linux/interrupt.h>
99−
100−#include "../comedi_pci.h"
99+#include <linux/comedi/comedi_pci.h>
101100
102101 #include "8255.h"
103102 #include "plx9080.h"
drivers/comedi/drivers/das08.c+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
1010 */
1111
1212 #include <linux/module.h>
13−
14−#include "../comedidev.h"
13+#include <linux/comedi/comedidev.h>
1514
1615 #include "8255.h"
1716 #include "comedi_8254.h"
drivers/comedi/drivers/das08_cs.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
3030 */
3131
3232 #include <linux/module.h>
33−
34−#include "../comedi_pcmcia.h"
33+#include <linux/comedi/comedi_pcmcia.h>
3534
3635 #include "das08.h"
3736
drivers/comedi/drivers/das08_isa.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 */
3030
3131 #include <linux/module.h>
32−#include "../comedidev.h"
32+#include <linux/comedi/comedidev.h>
3333
3434 #include "das08.h"
3535
drivers/comedi/drivers/das08_pci.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
2323 */
2424
2525 #include <linux/module.h>
26−
27−#include "../comedi_pci.h"
26+#include <linux/comedi/comedi_pci.h>
2827
2928 #include "das08.h"
3029
drivers/comedi/drivers/das16.c+1−2
@@ -63,8 +63,7 @@ · 62 unmodified lines
6363 #include <linux/module.h>
6464 #include <linux/slab.h>
6565 #include <linux/interrupt.h>
66−
67−#include "../comedidev.h"
66+#include <linux/comedi/comedidev.h>
6867
6968 #include "comedi_isadma.h"
7069 #include "comedi_8254.h"
drivers/comedi/drivers/das16m1.c+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
4242 #include <linux/module.h>
4343 #include <linux/slab.h>
4444 #include <linux/interrupt.h>
45−#include "../comedidev.h"
45+#include <linux/comedi/comedidev.h>
4646
4747 #include "8255.h"
4848 #include "comedi_8254.h"
drivers/comedi/drivers/das1800.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
7373 #include <linux/interrupt.h>
7474 #include <linux/slab.h>
7575 #include <linux/io.h>
76−
77−#include "../comedidev.h"
76+#include <linux/comedi/comedidev.h>
7877
7978 #include "comedi_isadma.h"
8079 #include "comedi_8254.h"
drivers/comedi/drivers/das6402.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424
2525 #include <linux/module.h>
2626 #include <linux/interrupt.h>
27−
28−#include "../comedidev.h"
27+#include <linux/comedi/comedidev.h>
2928
3029 #include "comedi_8254.h"
3130
drivers/comedi/drivers/das800.c+1−2
@@ -46,8 +46,7 @@ · 45 unmodified lines
4646 #include <linux/module.h>
4747 #include <linux/interrupt.h>
4848 #include <linux/delay.h>
49−
50−#include "../comedidev.h"
49+#include <linux/comedi/comedidev.h>
5150
5251 #include "comedi_8254.h"
5352
drivers/comedi/drivers/dmm32at.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include <linux/module.h>
3030 #include <linux/delay.h>
3131 #include <linux/interrupt.h>
32−#include "../comedidev.h"
32+#include <linux/comedi/comedidev.h>
3333
3434 #include "8255.h"
3535
drivers/comedi/drivers/dt2801.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 */
3232
3333 #include <linux/module.h>
34−#include "../comedidev.h"
34+#include <linux/comedi/comedidev.h>
3535 #include <linux/delay.h>
3636
3737 #define DT2801_TIMEOUT 1000
drivers/comedi/drivers/dt2811.c+1−2
@@ -40,8 +40,7 @@ · 39 unmodified lines
4040 #include <linux/module.h>
4141 #include <linux/interrupt.h>
4242 #include <linux/delay.h>
43−
44−#include "../comedidev.h"
43+#include <linux/comedi/comedidev.h>
4544
4645 /*
4746 * Register I/O map
drivers/comedi/drivers/dt2814.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
2727
2828 #include <linux/module.h>
2929 #include <linux/interrupt.h>
30−#include "../comedidev.h"
31−
30+#include <linux/comedi/comedidev.h>
3231 #include <linux/delay.h>
3332
3433 #define DT2814_CSR 0
drivers/comedi/drivers/dt2815.c+1−2
@@ -43,8 +43,7 @@ · 42 unmodified lines
4343 */
4444
4545 #include <linux/module.h>
46−#include "../comedidev.h"
47−
46+#include <linux/comedi/comedidev.h>
4847 #include <linux/delay.h>
4948
5049 #define DT2815_DATA 0
drivers/comedi/drivers/dt2817.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
2929
3030 #define DT2817_CR 0
3131 #define DT2817_DATA 1
drivers/comedi/drivers/dt282x.c+1−2
@@ -51,8 +51,7 @@ · 50 unmodified lines
5151 #include <linux/gfp.h>
5252 #include <linux/interrupt.h>
5353 #include <linux/io.h>
54−
55−#include "../comedidev.h"
54+#include <linux/comedi/comedidev.h>
5655
5756 #include "comedi_isadma.h"
5857
drivers/comedi/drivers/dt3000.c+1−2
@@ -43,8 +43,7 @@ · 42 unmodified lines
4343 #include <linux/module.h>
4444 #include <linux/delay.h>
4545 #include <linux/interrupt.h>
46−
47−#include "../comedi_pci.h"
46+#include <linux/comedi/comedi_pci.h>
4847
4948 /*
5049 * PCI BAR0 - dual-ported RAM location definitions (dev->mmio)
drivers/comedi/drivers/dt9812.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
3434 #include <linux/errno.h>
3535 #include <linux/slab.h>
3636 #include <linux/uaccess.h>
37−
38−#include "../comedi_usb.h"
37+#include <linux/comedi/comedi_usb.h>
3938
4039 #define DT9812_DIAGS_BOARD_INFO_ADDR 0xFBFF
4140 #define DT9812_MAX_WRITE_CMD_PIPE_SIZE 32
drivers/comedi/drivers/dyna_pci10xx.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
2626 #include <linux/module.h>
2727 #include <linux/delay.h>
2828 #include <linux/mutex.h>
29−
30−#include "../comedi_pci.h"
29+#include <linux/comedi/comedi_pci.h>
3130
3231 #define READ_TIMEOUT 50
3332
drivers/comedi/drivers/fl512.c+1−2
@@ -21,8 +21,7 @@ · 20 unmodified lines
2121 */
2222
2323 #include <linux/module.h>
24−#include "../comedidev.h"
25−
24+#include <linux/comedi/comedidev.h>
2625 #include <linux/delay.h>
2726
2827 /*
drivers/comedi/drivers/gsc_hpdi.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
3434 #include <linux/module.h>
3535 #include <linux/delay.h>
3636 #include <linux/interrupt.h>
37−
38−#include "../comedi_pci.h"
37+#include <linux/comedi/comedi_pci.h>
3938
4039 #include "plx9080.h"
4140
drivers/comedi/drivers/icp_multi.c+1−2
@@ -36,8 +36,7 @@ · 35 unmodified lines
3636
3737 #include <linux/module.h>
3838 #include <linux/delay.h>
39−
40−#include "../comedi_pci.h"
39+#include <linux/comedi/comedi_pci.h>
4140
4241 #define ICP_MULTI_ADC_CSR 0x00 /* R/W: ADC command/status register */
4342 #define ICP_MULTI_ADC_CSR_ST BIT(0) /* Start ADC */
drivers/comedi/drivers/ii_pci20kc.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030
3131 #include <linux/module.h>
3232 #include <linux/io.h>
33−#include "../comedidev.h"
33+#include <linux/comedi/comedidev.h>
3434
3535 /*
3636 * Register I/O map
drivers/comedi/drivers/jr3_pci.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
3535 #include <linux/jiffies.h>
3636 #include <linux/slab.h>
3737 #include <linux/timer.h>
38−
39−#include "../comedi_pci.h"
38+#include <linux/comedi/comedi_pci.h>
4039
4140 #include "jr3_pci.h"
4241
drivers/comedi/drivers/ke_counter.c+1−2
@@ -19,8 +19,7 @@ · 18 unmodified lines
1919 */
2020
2121 #include <linux/module.h>
22−
23−#include "../comedi_pci.h"
22+#include <linux/comedi/comedi_pci.h>
2423
2524 /*
2625 * PCI BAR 0 Register I/O map
drivers/comedi/drivers/me4000.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
3232 #include <linux/module.h>
3333 #include <linux/delay.h>
3434 #include <linux/interrupt.h>
35−
36−#include "../comedi_pci.h"
35+#include <linux/comedi/comedi_pci.h>
3736
3837 #include "comedi_8254.h"
3938 #include "plx9052.h"
drivers/comedi/drivers/me_daq.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
2323 #include <linux/module.h>
2424 #include <linux/interrupt.h>
2525 #include <linux/sched.h>
26−
27−#include "../comedi_pci.h"
26+#include <linux/comedi/comedi_pci.h>
2827
2928 #include "plx9052.h"
3029
drivers/comedi/drivers/mf6x4.c+1−2
@@ -18,8 +18,7 @@ · 17 unmodified lines
1818
1919 #include <linux/module.h>
2020 #include <linux/delay.h>
21−
22−#include "../comedi_pci.h"
21+#include <linux/comedi/comedi_pci.h>
2322
2423 /* Registers present in BAR0 memory region */
2524 #define MF624_GPIOC_REG 0x54
drivers/comedi/drivers/mite.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
3838 #include <linux/module.h>
3939 #include <linux/slab.h>
4040 #include <linux/log2.h>
41−
42−#include "../comedi_pci.h"
41+#include <linux/comedi/comedi_pci.h>
4342
4443 #include "mite.h"
4544
drivers/comedi/drivers/mpc624.c+1−2
@@ -44,8 +44,7 @@ · 43 unmodified lines
4444 */
4545
4646 #include <linux/module.h>
47−#include "../comedidev.h"
48−
47+#include <linux/comedi/comedidev.h>
4948 #include <linux/delay.h>
5049
5150 /* Offsets of different ports */
drivers/comedi/drivers/multiq3.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
2626 */
2727
2828 #include <linux/module.h>
29−
30−#include "../comedidev.h"
29+#include <linux/comedi/comedidev.h>
3130
3231 /*
3332 * Register map
drivers/comedi/drivers/ni_6527.c+1−2
@@ -20,8 +20,7 @@ · 19 unmodified lines
2020
2121 #include <linux/module.h>
2222 #include <linux/interrupt.h>
23−
24−#include "../comedi_pci.h"
23+#include <linux/comedi/comedi_pci.h>
2524
2625 /*
2726 * PCI BAR1 - Register memory map
drivers/comedi/drivers/ni_65xx.c+1−2
@@ -49,8 +49,7 @@ · 48 unmodified lines
4949
5050 #include <linux/module.h>
5151 #include <linux/interrupt.h>
52−
53−#include "../comedi_pci.h"
52+#include <linux/comedi/comedi_pci.h>
5453
5554 /*
5655 * PCI BAR1 Register Map
drivers/comedi/drivers/ni_660x.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
2626
2727 #include <linux/module.h>
2828 #include <linux/interrupt.h>
29−
30−#include "../comedi_pci.h"
29+#include <linux/comedi/comedi_pci.h>
3130
3231 #include "mite.h"
3332 #include "ni_tio.h"
drivers/comedi/drivers/ni_670x.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424 #include <linux/module.h>
2525 #include <linux/interrupt.h>
2626 #include <linux/slab.h>
27−
28−#include "../comedi_pci.h"
27+#include <linux/comedi/comedi_pci.h>
2928
3029 #define AO_VALUE_OFFSET 0x00
3130 #define AO_CHAN_OFFSET 0x0c
drivers/comedi/drivers/ni_at_a2150.c+1−2
@@ -39,8 +39,7 @@ · 38 unmodified lines
3939 #include <linux/interrupt.h>
4040 #include <linux/slab.h>
4141 #include <linux/io.h>
42−
43−#include "../comedidev.h"
42+#include <linux/comedi/comedidev.h>
4443
4544 #include "comedi_isadma.h"
4645 #include "comedi_8254.h"
drivers/comedi/drivers/ni_at_ao.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−
29−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
3029
3130 #include "comedi_8254.h"
3231
drivers/comedi/drivers/ni_atmio.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
7373
7474 #include <linux/module.h>
7575 #include <linux/interrupt.h>
76−#include "../comedidev.h"
77−
76+#include <linux/comedi/comedidev.h>
7877 #include <linux/isapnp.h>
7978
8079 #include "ni_stc.h"
drivers/comedi/drivers/ni_atmio16d.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
3939
4040 #include <linux/module.h>
4141 #include <linux/interrupt.h>
42−#include "../comedidev.h"
42+#include <linux/comedi/comedidev.h>
4343
4444 #include "8255.h"
4545
drivers/comedi/drivers/ni_daq_700.c+1−2
@@ -41,8 +41,7 @@ · 40 unmodified lines
4141 #include <linux/module.h>
4242 #include <linux/delay.h>
4343 #include <linux/interrupt.h>
44−
45−#include "../comedi_pcmcia.h"
44+#include <linux/comedi/comedi_pcmcia.h>
4645
4746 /* daqcard700 registers */
4847 #define DIO_W 0x04 /* WO 8bit */
drivers/comedi/drivers/ni_daq_dio24.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 */
2424
2525 #include <linux/module.h>
26−#include "../comedi_pcmcia.h"
26+#include <linux/comedi/comedi_pcmcia.h>
2727
2828 #include "8255.h"
2929
drivers/comedi/drivers/ni_labpc.c+1−2
@@ -48,8 +48,7 @@ · 47 unmodified lines
4848 */
4949
5050 #include <linux/module.h>
51−
52−#include "../comedidev.h"
51+#include <linux/comedi/comedidev.h>
5352
5453 #include "ni_labpc.h"
5554 #include "ni_labpc_isadma.h"
drivers/comedi/drivers/ni_labpc_common.c+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
1212 #include <linux/io.h>
1313 #include <linux/delay.h>
1414 #include <linux/slab.h>
15−
16−#include "../comedidev.h"
15+#include <linux/comedi/comedidev.h>
1716
1817 #include "comedi_8254.h"
1918 #include "8255.h"
drivers/comedi/drivers/ni_labpc_cs.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
3838 */
3939
4040 #include <linux/module.h>
41−
42−#include "../comedi_pcmcia.h"
41+#include <linux/comedi/comedi_pcmcia.h>
4342
4443 #include "ni_labpc.h"
4544
drivers/comedi/drivers/ni_labpc_isadma.c+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
1010
1111 #include <linux/module.h>
1212 #include <linux/slab.h>
13−
14−#include "../comedidev.h"
13+#include <linux/comedi/comedidev.h>
1514
1615 #include "comedi_isadma.h"
1716 #include "ni_labpc.h"
drivers/comedi/drivers/ni_labpc_pci.c+1−2
@@ -22,8 +22,7 @@ · 21 unmodified lines
2222
2323 #include <linux/module.h>
2424 #include <linux/interrupt.h>
25−
26−#include "../comedi_pci.h"
25+#include <linux/comedi/comedi_pci.h>
2726
2827 #include "ni_labpc.h"
2928
drivers/comedi/drivers/ni_mio_cs.c+1−1
@@ -28,8 +28,8 @@ · 27 unmodified lines
2828
2929 #include <linux/module.h>
3030 #include <linux/delay.h>
31+#include <linux/comedi/comedi_pcmcia.h>
3132
32−#include "../comedi_pcmcia.h"
3333 #include "ni_stc.h"
3434 #include "8255.h"
3535
drivers/comedi/drivers/ni_pcidio.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
4242 #include <linux/delay.h>
4343 #include <linux/interrupt.h>
4444 #include <linux/sched.h>
45−
46−#include "../comedi_pci.h"
45+#include <linux/comedi/comedi_pci.h>
4746
4847 #include "mite.h"
4948
drivers/comedi/drivers/ni_pcimio.c+1−3
@@ -94,9 +94,7 @@ · 93 unmodified lines
9494
9595 #include <linux/module.h>
9696 #include <linux/delay.h>
97−
98−#include "../comedi_pci.h"
99−
97+#include <linux/comedi/comedi_pci.h>
10098 #include <asm/byteorder.h>
10199
102100 #include "ni_stc.h"
drivers/comedi/drivers/ni_routes.c+1−2
@@ -21,8 +21,7 @@ · 20 unmodified lines
2121 #include <linux/slab.h>
2222 #include <linux/bsearch.h>
2323 #include <linux/sort.h>
24−
25−#include "../comedi.h"
24+#include <linux/comedi.h>
2625
2726 #include "ni_routes.h"
2827 #include "ni_routing/ni_route_values.h"
drivers/comedi/drivers/ni_routes.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/bitops.h>
2828 #endif
2929
30−#include "../comedi.h"
30+#include <linux/comedi.h>
3131
3232 /**
3333 * struct ni_route_set - Set of destinations with a common source.
drivers/comedi/drivers/ni_routing/ni_route_values.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #ifndef _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H
2121 #define _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H
2222
23−#include "../../comedi.h"
23+#include <linux/comedi.h>
2424 #include <linux/types.h>
2525
2626 /*
drivers/comedi/drivers/ni_tio.h+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #ifndef _COMEDI_NI_TIO_H
99 #define _COMEDI_NI_TIO_H
1010
11−#include "../comedidev.h"
11+#include <linux/comedi/comedidev.h>
1212
1313 enum ni_gpct_register {
1414 NITIO_G0_AUTO_INC,
drivers/comedi/drivers/ni_usb6501.c+1−2
@@ -87,8 +87,7 @@ · 86 unmodified lines
8787 #include <linux/kernel.h>
8888 #include <linux/module.h>
8989 #include <linux/slab.h>
90−
91−#include "../comedi_usb.h"
90+#include <linux/comedi/comedi_usb.h>
9291
9392 #define NI6501_TIMEOUT 1000
9493
drivers/comedi/drivers/pcl711.c+1−2
@@ -29,8 +29,7 @@ · 28 unmodified lines
2929 #include <linux/module.h>
3030 #include <linux/delay.h>
3131 #include <linux/interrupt.h>
32−
33−#include "../comedidev.h"
32+#include <linux/comedi/comedidev.h>
3433
3534 #include "comedi_8254.h"
3635
drivers/comedi/drivers/pcl724.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
2929
3030 #include "8255.h"
3131
drivers/comedi/drivers/pcl726.c+1−2
@@ -50,8 +50,7 @@ · 49 unmodified lines
5050
5151 #include <linux/module.h>
5252 #include <linux/interrupt.h>
53−
54−#include "../comedidev.h"
53+#include <linux/comedi/comedidev.h>
5554
5655 #define PCL726_AO_MSB_REG(x) (0x00 + ((x) * 2))
5756 #define PCL726_AO_LSB_REG(x) (0x01 + ((x) * 2))
drivers/comedi/drivers/pcl730.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include <linux/module.h>
28−#include "../comedidev.h"
28+#include <linux/comedi/comedidev.h>
2929
3030 /*
3131 * Register map
drivers/comedi/drivers/pcl812.c+1−2
@@ -114,8 +114,7 @@ · 113 unmodified lines
114114 #include <linux/gfp.h>
115115 #include <linux/delay.h>
116116 #include <linux/io.h>
117−
118−#include "../comedidev.h"
117+#include <linux/comedi/comedidev.h>
119118
120119 #include "comedi_isadma.h"
121120 #include "comedi_8254.h"
drivers/comedi/drivers/pcl816.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
3535 #include <linux/delay.h>
3636 #include <linux/io.h>
3737 #include <linux/interrupt.h>
38−
39−#include "../comedidev.h"
38+#include <linux/comedi/comedidev.h>
4039
4140 #include "comedi_isadma.h"
4241 #include "comedi_8254.h"
drivers/comedi/drivers/pcl818.c+1−2
@@ -97,8 +97,7 @@ · 96 unmodified lines
9797 #include <linux/delay.h>
9898 #include <linux/io.h>
9999 #include <linux/interrupt.h>
100−
101−#include "../comedidev.h"
100+#include <linux/comedi/comedidev.h>
102101
103102 #include "comedi_isadma.h"
104103 #include "comedi_8254.h"
drivers/comedi/drivers/pcm3724.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 */
2525
2626 #include <linux/module.h>
27−#include "../comedidev.h"
27+#include <linux/comedi/comedidev.h>
2828
2929 #include "8255.h"
3030
drivers/comedi/drivers/pcmad.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 */
3030
3131 #include <linux/module.h>
32−#include "../comedidev.h"
32+#include <linux/comedi/comedidev.h>
3333
3434 #define PCMAD_STATUS 0
3535 #define PCMAD_LSB 1
drivers/comedi/drivers/pcmda12.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 */
4141
4242 #include <linux/module.h>
43−#include "../comedidev.h"
43+#include <linux/comedi/comedidev.h>
4444
4545 /* AI range is not configurable, it's set by jumpers on the board */
4646 static const struct comedi_lrange pcmda12_ranges = {
drivers/comedi/drivers/pcmmio.c+1−2
@@ -66,8 +66,7 @@ · 65 unmodified lines
6666 #include <linux/module.h>
6767 #include <linux/interrupt.h>
6868 #include <linux/slab.h>
69−
70−#include "../comedidev.h"
69+#include <linux/comedi/comedidev.h>
7170
7271 /*
7372 * Register I/O map
drivers/comedi/drivers/pcmuio.c+1−2
@@ -65,8 +65,7 @@ · 64 unmodified lines
6565
6666 #include <linux/module.h>
6767 #include <linux/interrupt.h>
68−
69−#include "../comedidev.h"
68+#include <linux/comedi/comedidev.h>
7069
7170 /*
7271 * Register I/O map
drivers/comedi/drivers/quatech_daqp_cs.c+1−2
@@ -41,8 +41,7 @@ · 40 unmodified lines
4141 */
4242
4343 #include <linux/module.h>
44−
45−#include "../comedi_pcmcia.h"
44+#include <linux/comedi/comedi_pcmcia.h>
4645
4746 /*
4847 * Register I/O map
drivers/comedi/drivers/rtd520.c+1−2
@@ -85,8 +85,7 @@ · 84 unmodified lines
8585 #include <linux/module.h>
8686 #include <linux/delay.h>
8787 #include <linux/interrupt.h>
88−
89−#include "../comedi_pci.h"
88+#include <linux/comedi/comedi_pci.h>
9089
9190 #include "comedi_8254.h"
9291 #include "plx9080.h"
drivers/comedi/drivers/rti800.c+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
4242 #include <linux/module.h>
4343 #include <linux/delay.h>
4444 #include <linux/interrupt.h>
45−#include "../comedidev.h"
45+#include <linux/comedi/comedidev.h>
4646
4747 /*
4848 * Register map
drivers/comedi/drivers/rti802.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 */
2323
2424 #include <linux/module.h>
25−#include "../comedidev.h"
25+#include <linux/comedi/comedidev.h>
2626
2727 /*
2828 * Register I/O map
drivers/comedi/drivers/s526.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 */
2828
2929 #include <linux/module.h>
30−#include "../comedidev.h"
30+#include <linux/comedi/comedidev.h>
3131
3232 /*
3333 * Register I/O map
drivers/comedi/drivers/s626.c+1−2
@@ -55,8 +55,7 @@ · 54 unmodified lines
5555 #include <linux/interrupt.h>
5656 #include <linux/kernel.h>
5757 #include <linux/types.h>
58−
59−#include "../comedi_pci.h"
58+#include <linux/comedi/comedi_pci.h>
6059
6160 #include "s626.h"
6261
drivers/comedi/drivers/ssv_dnp.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 /* include files ----------------------------------------------------------- */
2020
2121 #include <linux/module.h>
22−#include "../comedidev.h"
22+#include <linux/comedi/comedidev.h>
2323
2424 /* Some global definitions: the registers of the DNP ----------------------- */
2525 /* */
drivers/comedi/drivers/usbdux.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
7373 #include <linux/input.h>
7474 #include <linux/fcntl.h>
7575 #include <linux/compiler.h>
76−
77−#include "../comedi_usb.h"
76+#include <linux/comedi/comedi_usb.h>
7877
7978 /* constants for firmware upload and download */
8079 #define USBDUX_FIRMWARE "usbdux_firmware.bin"
drivers/comedi/drivers/usbduxfast.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 #include <linux/input.h>
4141 #include <linux/fcntl.h>
4242 #include <linux/compiler.h>
43−#include "../comedi_usb.h"
43+#include <linux/comedi/comedi_usb.h>
4444
4545 /*
4646 * timeout for the USB-transfer
drivers/comedi/drivers/usbduxsigma.c+1−2
@@ -40,8 +40,7 @@ · 39 unmodified lines
4040 #include <linux/fcntl.h>
4141 #include <linux/compiler.h>
4242 #include <asm/unaligned.h>
43−
44−#include "../comedi_usb.h"
43+#include <linux/comedi/comedi_usb.h>
4544
4645 /* timeout for the USB-transfer in ms*/
4746 #define BULK_TIMEOUT 1000
drivers/comedi/drivers/vmk80xx.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
3535 #include <linux/slab.h>
3636 #include <linux/poll.h>
3737 #include <linux/uaccess.h>
38−
39−#include "../comedi_usb.h"
38+#include <linux/comedi/comedi_usb.h>
4039
4140 enum {
4241 DEVICE_VMK8055,
drivers/comedi/kcomedilib/kcomedilib_main.c+3−3
@@ -16,9 +16,9 @@ · 15 unmodified lines
1616 #include <linux/mm.h>
1717 #include <linux/io.h>
1818
19−#include "../comedi.h"
20−#include "../comedilib.h"
21−#include "../comedidev.h"
19+#include <linux/comedi.h>
20+#include <linux/comedi/comedidev.h>
21+#include <linux/comedi/comedilib.h>
2222
2323 MODULE_AUTHOR("David Schleef <ds@schleef.org>");
2424 MODULE_DESCRIPTION("Comedi kernel library");
drivers/comedi/proc.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 * was cool.
1414 */
1515
16−#include "comedidev.h"
16+#include <linux/comedi/comedidev.h>
1717 #include "comedi_internal.h"
1818 #include <linux/proc_fs.h>
1919 #include <linux/seq_file.h>
drivers/comedi/range.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/uaccess.h>
11−#include "comedidev.h"
11+#include <linux/comedi/comedidev.h>
1212 #include "comedi_internal.h"
1313
1414 const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };
include/linux/comedi/comedi_pci.hrenamed from drivers/comedi/comedi_pci.h+1−2
@@ -11,8 +11,7 @@ · 10 unmodified lines
1111 #define _COMEDI_PCI_H
1212
1313 #include <linux/pci.h>
14−
15−#include "comedidev.h"
14+#include <linux/comedi/comedidev.h>
1615
1716 /*
1817 * PCI Vendor IDs not in <linux/pci_ids.h>
include/linux/comedi/comedi_pcmcia.hrenamed from drivers/comedi/comedi_pcmcia.h+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
1212
1313 #include <pcmcia/cistpl.h>
1414 #include <pcmcia/ds.h>
15−
16−#include "comedidev.h"
15+#include <linux/comedi/comedidev.h>
1716
1817 struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *dev);
1918
include/linux/comedi/comedi_usb.hrenamed from drivers/comedi/comedi_usb.h+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
1010 #define _COMEDI_USB_H
1111
1212 #include <linux/usb.h>
13−
14−#include "comedidev.h"
13+#include <linux/comedi/comedidev.h>
1514
1615 struct usb_interface *comedi_to_usb_interface(struct comedi_device *dev);
1716 struct usb_device *comedi_to_usb_dev(struct comedi_device *dev);
include/linux/comedi/comedidev.hrenamed from drivers/comedi/comedidev.h+1−2
@@ -15,8 +15,7 @@ · 14 unmodified lines
1515 #include <linux/spinlock_types.h>
1616 #include <linux/rwsem.h>
1717 #include <linux/kref.h>
18−
19−#include "comedi.h"
18+#include <linux/comedi.h>
2019
2120 #define COMEDI_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
2221 #define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, \
include/linux/comedi/comedilib.hrenamed from drivers/comedi/comedilib.h+0−0

File renamed without changes.

include/uapi/linux/comedi.hrenamed from drivers/comedi/comedi.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: LGPL-2.0+ */
1+/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
22 /*
33 * comedi.h
44 * header file for COMEDI user API

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t