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

comedi: Move "comedi_isadma.h" to <linux/comedi/comedi_isadma.h>

Some of the header files in "drivers/comedi/drivers/" are common enough
to be useful to out-of-tree comedi driver modules. Using them for
out-of-tree module builds is hampered by the headers being outside the
"include/" directory so it is desirable to move them.

There are about a half a dozen or so Comedi device drivers that use the
"comedi_isadma" module to add ISA DMA support. The macros and
declarations to use that module are in the "comedi_isadma.h" header file
in the comedi "drivers" directory. Move it into
"include/linux/comedi/".

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20211117120604.117740-6-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ian Abbott and committed by
Greg Kroah-Hartman
fe7a4f5b 44fb7aff

+9 -17
+1 -2
drivers/comedi/drivers/comedi_isadma.c
··· 10 10 #include <linux/dma-mapping.h> 11 11 #include <asm/dma.h> 12 12 #include <linux/comedi/comedidev.h> 13 - 14 - #include "comedi_isadma.h" 13 + #include <linux/comedi/comedi_isadma.h> 15 14 16 15 /** 17 16 * comedi_isadma_program - program and enable an ISA DMA transfer
drivers/comedi/drivers/comedi_isadma.h include/linux/comedi/comedi_isadma.h
+1 -2
drivers/comedi/drivers/das16.c
··· 66 66 #include <linux/comedi/comedidev.h> 67 67 #include <linux/comedi/comedi_8255.h> 68 68 #include <linux/comedi/comedi_8254.h> 69 - 70 - #include "comedi_isadma.h" 69 + #include <linux/comedi/comedi_isadma.h> 71 70 72 71 #define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */ 73 72
+1 -2
drivers/comedi/drivers/das1800.c
··· 75 75 #include <linux/io.h> 76 76 #include <linux/comedi/comedidev.h> 77 77 #include <linux/comedi/comedi_8254.h> 78 - 79 - #include "comedi_isadma.h" 78 + #include <linux/comedi/comedi_isadma.h> 80 79 81 80 /* misc. defines */ 82 81 #define DAS1800_SIZE 16 /* uses 16 io addresses */
+1 -2
drivers/comedi/drivers/dt282x.c
··· 52 52 #include <linux/interrupt.h> 53 53 #include <linux/io.h> 54 54 #include <linux/comedi/comedidev.h> 55 - 56 - #include "comedi_isadma.h" 55 + #include <linux/comedi/comedi_isadma.h> 57 56 58 57 /* 59 58 * Register map
+1 -2
drivers/comedi/drivers/ni_at_a2150.c
··· 41 41 #include <linux/io.h> 42 42 #include <linux/comedi/comedidev.h> 43 43 #include <linux/comedi/comedi_8254.h> 44 - 45 - #include "comedi_isadma.h" 44 + #include <linux/comedi/comedi_isadma.h> 46 45 47 46 #define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */ 48 47
+1 -1
drivers/comedi/drivers/ni_labpc_isadma.c
··· 11 11 #include <linux/module.h> 12 12 #include <linux/slab.h> 13 13 #include <linux/comedi/comedidev.h> 14 + #include <linux/comedi/comedi_isadma.h> 14 15 15 - #include "comedi_isadma.h" 16 16 #include "ni_labpc.h" 17 17 #include "ni_labpc_regs.h" 18 18 #include "ni_labpc_isadma.h"
+1 -2
drivers/comedi/drivers/pcl812.c
··· 116 116 #include <linux/io.h> 117 117 #include <linux/comedi/comedidev.h> 118 118 #include <linux/comedi/comedi_8254.h> 119 - 120 - #include "comedi_isadma.h" 119 + #include <linux/comedi/comedi_isadma.h> 121 120 122 121 /* 123 122 * Register I/O map
+1 -2
drivers/comedi/drivers/pcl816.c
··· 37 37 #include <linux/interrupt.h> 38 38 #include <linux/comedi/comedidev.h> 39 39 #include <linux/comedi/comedi_8254.h> 40 - 41 - #include "comedi_isadma.h" 40 + #include <linux/comedi/comedi_isadma.h> 42 41 43 42 /* 44 43 * Register I/O map
+1 -2
drivers/comedi/drivers/pcl818.c
··· 99 99 #include <linux/interrupt.h> 100 100 #include <linux/comedi/comedidev.h> 101 101 #include <linux/comedi/comedi_8254.h> 102 - 103 - #include "comedi_isadma.h" 102 + #include <linux/comedi/comedi_isadma.h> 104 103 105 104 /* 106 105 * Register I/O map