Commit 8e6b7915 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: drivers do not need <linux/ioport.h>

All the ioport resources are managed by the comedi core. None of
the drivers depend on <linux/ioport.h>. Remove the includes.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce157f80
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
......
...@@ -76,8 +76,6 @@ I/O port base address can be found in the output of 'lspci -v'. ...@@ -76,8 +76,6 @@ I/O port base address can be found in the output of 'lspci -v'.
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include "comedi_fc.h" #include "comedi_fc.h"
#include "8255.h" #include "8255.h"
......
...@@ -37,7 +37,6 @@ Configuration Options: ...@@ -37,7 +37,6 @@ Configuration Options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include "8255.h" #include "8255.h"
/* /*
......
...@@ -32,7 +32,6 @@ Configuration Options: ...@@ -32,7 +32,6 @@ Configuration Options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define AIO_IIRO_16_SIZE 0x08 #define AIO_IIRO_16_SIZE 0x08
#define AIO_IIRO_16_RELAY_0_7 0x00 #define AIO_IIRO_16_RELAY_0_7 0x00
......
...@@ -35,7 +35,6 @@ This driver will not work with a 2.4 kernel. ...@@ -35,7 +35,6 @@ This driver will not work with a 2.4 kernel.
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/timex.h> #include <linux/timex.h>
......
...@@ -79,7 +79,6 @@ pin, which can be used to wake up tasks. ...@@ -79,7 +79,6 @@ pin, which can be used to wake up tasks.
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ioport.h>
#include "comedi_fc.h" #include "comedi_fc.h"
......
...@@ -53,7 +53,6 @@ irq can be omitted, although the cmd interface will not work without it. ...@@ -53,7 +53,6 @@ irq can be omitted, although the cmd interface will not work without it.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/ioport.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
......
...@@ -100,7 +100,6 @@ Unipolar and bipolar ranges cannot be mixed in the channel/gain list. ...@@ -100,7 +100,6 @@ Unipolar and bipolar ranges cannot be mixed in the channel/gain list.
#include <linux/io.h> #include <linux/io.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <asm/dma.h> #include <asm/dma.h>
#include "8253.h" #include "8253.h"
......
...@@ -37,8 +37,6 @@ This driver has suffered bitrot. ...@@ -37,8 +37,6 @@ This driver has suffered bitrot.
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define DAS6402_SIZE 16 #define DAS6402_SIZE 16
#define N_WORDS (3000*64) #define N_WORDS (3000*64)
......
...@@ -60,7 +60,6 @@ cmd triggers supported: ...@@ -60,7 +60,6 @@ cmd triggers supported:
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "8253.h" #include "8253.h"
......
...@@ -36,7 +36,6 @@ Configuration Options: ...@@ -36,7 +36,6 @@ Configuration Options:
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include "comedi_fc.h" #include "comedi_fc.h"
......
...@@ -32,7 +32,6 @@ Configuration options: ...@@ -32,7 +32,6 @@ Configuration options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#define DT2801_TIMEOUT 1000 #define DT2801_TIMEOUT 1000
......
...@@ -45,8 +45,6 @@ Configuration options: ...@@ -45,8 +45,6 @@ Configuration options:
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = { static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = {
4, { 4, {
RANGE(0, 5), RANGE(0, 5),
......
...@@ -38,7 +38,6 @@ addition, the clock does not seem to be very accurate. ...@@ -38,7 +38,6 @@ addition, the clock does not seem to be very accurate.
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "comedi_fc.h" #include "comedi_fc.h"
......
...@@ -54,7 +54,6 @@ Configuration options: ...@@ -54,7 +54,6 @@ Configuration options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#define DT2815_SIZE 2 #define DT2815_SIZE 2
......
...@@ -36,8 +36,6 @@ Configuration options: ...@@ -36,8 +36,6 @@ Configuration options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define DT2817_SIZE 5 #define DT2817_SIZE 5
#define DT2817_CR 0 #define DT2817_CR 0
......
...@@ -56,7 +56,6 @@ Configuration options: ...@@ -56,7 +56,6 @@ Configuration options:
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/ioport.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
......
...@@ -22,7 +22,6 @@ Configuration options: ...@@ -22,7 +22,6 @@ Configuration options:
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#define FL512_SIZE 16 /* the size of the used memory */ #define FL512_SIZE 16 /* the size of the used memory */
struct fl512_private { struct fl512_private {
......
...@@ -54,7 +54,6 @@ Configuration Options: ...@@ -54,7 +54,6 @@ Configuration Options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
/* Consecutive I/O port addresses */ /* Consecutive I/O port addresses */
......
...@@ -28,8 +28,6 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3) ...@@ -28,8 +28,6 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3)
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define MULTIQ3_SIZE 16 #define MULTIQ3_SIZE 16
/* /*
......
...@@ -64,7 +64,6 @@ TRIG_WAKE_EOS ...@@ -64,7 +64,6 @@ TRIG_WAKE_EOS
#include <linux/slab.h> #include <linux/slab.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -39,8 +39,6 @@ Configuration options: ...@@ -39,8 +39,6 @@ Configuration options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
/* board egisters */ /* board egisters */
/* registers with _2_ are accessed when GRP2WR is set in CFG1 */ /* registers with _2_ are accessed when GRP2WR is set in CFG1 */
......
...@@ -34,8 +34,6 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d) ...@@ -34,8 +34,6 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include "comedi_fc.h" #include "comedi_fc.h"
#include "8255.h" #include "8255.h"
......
...@@ -47,7 +47,6 @@ Manuals: Register level: http://www.ni.com/pdf/manuals/340698.pdf ...@@ -47,7 +47,6 @@ Manuals: Register level: http://www.ni.com/pdf/manuals/340698.pdf
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
......
...@@ -57,7 +57,6 @@ supported. ...@@ -57,7 +57,6 @@ supported.
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "comedi_fc.h" #include "comedi_fc.h"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "8255.h" #include "8255.h"
......
...@@ -65,8 +65,6 @@ Interrupts are not supported. ...@@ -65,8 +65,6 @@ Interrupts are not supported.
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#undef ACL6126_IRQ /* no interrupt support (yet) */ #undef ACL6126_IRQ /* no interrupt support (yet) */
#define PCL726_SIZE 16 #define PCL726_SIZE 16
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
/* /*
* Register map * Register map
* *
......
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -35,7 +35,6 @@ Configuration Options: ...@@ -35,7 +35,6 @@ Configuration Options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
......
...@@ -99,7 +99,6 @@ A word or two about DMA. Driver support DMA operations at two ways: ...@@ -99,7 +99,6 @@ A word or two about DMA. Driver support DMA operations at two ways:
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/ioport.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
......
...@@ -31,7 +31,6 @@ Copy/pasted/hacked from pcm724.c ...@@ -31,7 +31,6 @@ Copy/pasted/hacked from pcm724.c
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "8255.h" #include "8255.h"
......
...@@ -33,8 +33,6 @@ Configuration options: ...@@ -33,8 +33,6 @@ Configuration options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
struct boarddef_struct { struct boarddef_struct {
const char *name; const char *name;
unsigned int iosize; unsigned int iosize;
......
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
/* /*
* Register map * Register map
*/ */
......
...@@ -35,8 +35,6 @@ Configuration Options: ...@@ -35,8 +35,6 @@ Configuration Options:
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define RTI802_SIZE 4 #define RTI802_SIZE 4
#define RTI802_SELECT 0 #define RTI802_SELECT 0
......
...@@ -38,7 +38,6 @@ comedi_config /dev/comedi0 s526 0x2C0,0x3 ...@@ -38,7 +38,6 @@ comedi_config /dev/comedi0 s526 0x2C0,0x3
#include <linux/module.h> #include <linux/module.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#define S526_SIZE 64 #define S526_SIZE 64
......
...@@ -30,7 +30,6 @@ Status: in development ...@@ -30,7 +30,6 @@ Status: in development
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -43,7 +43,6 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5), ...@@ -43,7 +43,6 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/ioport.h>
#define DRIVER_NAME "unioxx5" #define DRIVER_NAME "unioxx5"
#define UNIOXX5_SIZE 0x10 #define UNIOXX5_SIZE 0x10
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/io.h> #include <linux/io.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment