mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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 couple of dozen or so Comedi device drivers that use
the "comedi_8254" module to add timers based on the venerable 8254
Programmable Interval Timer chip.  The macros and declarations to use
that module are in the "comedi_8254.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-5-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2021-11-17 12:06:02 +00:00 committed by Greg Kroah-Hartman
parent 631e272b12
commit 44fb7affcf
28 changed files with 27 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/comedi/drivers/adl_pci9111.c
View file

@ -43,9 +43,9 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8254.h>
#include "plx9052.h"
#include "comedi_8254.h"
#define PCI9111_FIFO_HALF_SIZE 512

2
drivers/comedi/drivers/adl_pci9118.c
View file

@ -79,9 +79,9 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8254.h>
#include "amcc_s5933.h"
#include "comedi_8254.h"
/*
* PCI BAR2 Register map (dev->iobase)

2
drivers/comedi/drivers/adv_pci1710.c
View file

@ -31,8 +31,8 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "amcc_s5933.h"
/*

3
drivers/comedi/drivers/adv_pci_dio.c
View file

@ -25,8 +25,7 @@
#include <linux/delay.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register offset definitions

3
drivers/comedi/drivers/aio_aio12_8.c
View file

@ -24,8 +24,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register map

2
drivers/comedi/drivers/amplc_dio200_common.c
View file

@ -14,9 +14,9 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h> /* only for register defines */
#include <linux/comedi/comedi_8254.h>
#include "amplc_dio200.h"
#include "comedi_8254.h"
/* 200 series registers */
#define DIO200_IO_SIZE 0x20

3
drivers/comedi/drivers/amplc_pci224.c
View file

@ -97,8 +97,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/comedi/comedi_pci.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* PCI224/234 i/o space 1 (PCIBAR2) registers.

3
drivers/comedi/drivers/amplc_pci230.c
View file

@ -176,8 +176,7 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* PCI230 PCI configuration register information

3
drivers/comedi/drivers/cb_das16_cs.c
View file

@ -28,8 +28,7 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/comedi/comedi_pcmcia.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register I/O map

2
drivers/comedi/drivers/cb_pcidas.c
View file

@ -56,8 +56,8 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "amcc_s5933.h"
#define AI_BUFFER_SIZE 1024 /* max ai fifo size */

2
drivers/comedi/drivers/cb_pcimdas.c
View file

@ -36,8 +36,8 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "plx9052.h"
/*

3
drivers/comedi/drivers/comedi_8254.c
View file

@ -117,8 +117,7 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
static unsigned int __i8254_read(struct comedi_8254 *i8254, unsigned int reg)
{

2
drivers/comedi/drivers/das08.c
View file

@ -12,8 +12,8 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "das08.h"
/*

2
drivers/comedi/drivers/das16.c
View file

@ -65,9 +65,9 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
#define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */

3
drivers/comedi/drivers/das16m1.c
View file

@ -44,8 +44,7 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register map (dev->iobase)

2
drivers/comedi/drivers/das1800.c
View file

@ -74,9 +74,9 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
/* misc. defines */
#define DAS1800_SIZE 16 /* uses 16 io addresses */

3
drivers/comedi/drivers/das6402.c
View file

@ -25,8 +25,7 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register I/O map

3
drivers/comedi/drivers/das800.c
View file

@ -47,8 +47,7 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/comedi/comedidev.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
#define N_CHAN_AI 8 /* number of analog input channels */

2
drivers/comedi/drivers/me4000.c
View file

@ -33,8 +33,8 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "plx9052.h"
#define ME4000_FIRMWARE "me4000_firmware.bin"

2
drivers/comedi/drivers/ni_at_a2150.c
View file

@ -40,9 +40,9 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
#define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */

3
drivers/comedi/drivers/ni_at_ao.c
View file

@ -26,8 +26,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* Register map

2
drivers/comedi/drivers/ni_labpc_common.c
View file

@ -14,8 +14,8 @@
#include <linux/slab.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "ni_labpc.h"
#include "ni_labpc_regs.h"
#include "ni_labpc_isadma.h"

3
drivers/comedi/drivers/pcl711.c
View file

@ -30,8 +30,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include "comedi_8254.h"
#include <linux/comedi/comedi_8254.h>
/*
* I/O port register map

2
drivers/comedi/drivers/pcl812.c
View file

@ -115,9 +115,9 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
/*
* Register I/O map

2
drivers/comedi/drivers/pcl816.c
View file

@ -36,9 +36,9 @@
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
/*
* Register I/O map

2
drivers/comedi/drivers/pcl818.c
View file

@ -98,9 +98,9 @@
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
/*
* Register I/O map

2
drivers/comedi/drivers/rtd520.c
View file

@ -86,8 +86,8 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8254.h>
#include "comedi_8254.h"
#include "plx9080.h"
/*

0
drivers/comedi/drivers/comedi_8254.h → include/linux/comedi/comedi_8254.h
View file