From 38348dbdb6ba8c8e1d2466553cc6ba1619fd082c Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 21 Nov 2002 07:34:30 +0000 Subject: [PATCH] Huge monster patch that removes unnessary headers --- comedi/comedi_ksyms.c | 5 +---- comedi/drivers/8255.c | 14 ++------------ comedi/drivers/adl_pci9111.c | 15 +++------------ comedi/drivers/adl_pci9118.c | 17 +++-------------- comedi/drivers/adv_pci1710.c | 16 +++------------- comedi/drivers/amcc_s5933.c | 4 +--- comedi/drivers/amcc_s5933.h | 2 +- comedi/drivers/amplc_pc236.c | 16 ++-------------- comedi/drivers/amplc_pc263.c | 16 ++-------------- comedi/drivers/amplc_pci230.c | 16 ++-------------- comedi/drivers/cb_das16_cs.c | 14 +------------- comedi/drivers/cb_pcidas.c | 15 ++------------- comedi/drivers/cb_pcidas64.c | 15 ++------------- comedi/drivers/cb_pcidda.c | 15 +-------------- comedi/drivers/cb_pcimdas.c | 17 +++-------------- comedi/drivers/cb_pcimdda.c | 17 +++-------------- comedi/drivers/comedi_fc.c | 5 ++--- comedi/drivers/comedi_fc.h | 2 +- comedi/drivers/comedi_parport.c | 13 +------------ comedi/drivers/comedi_rt_timer.c | 3 --- comedi/drivers/comedi_test.c | 12 ++---------- comedi/drivers/contec_pci_dio.c | 16 ++-------------- comedi/drivers/daqboard2000.c | 17 +++-------------- comedi/drivers/das08.c | 9 +-------- comedi/drivers/das16.c | 8 +------- comedi/drivers/das16m1.c | 7 +------ comedi/drivers/das1800.c | 15 +++------------ comedi/drivers/das6402.c | 6 +----- comedi/drivers/das800.c | 14 +++----------- comedi/drivers/dt2801.c | 2 -- comedi/drivers/dt2811.c | 14 ++------------ comedi/drivers/dt2814.c | 13 +------------ comedi/drivers/dt2815.c | 13 ++----------- comedi/drivers/dt2817.c | 14 ++------------ comedi/drivers/dt282x.c | 11 +---------- comedi/drivers/dt3000.c | 4 +--- comedi/drivers/fl512.c | 15 +++------------ comedi/drivers/icp_multi.c | 14 ++------------ comedi/drivers/icp_multi.h | 2 +- comedi/drivers/ii_pci20kc.c | 7 ------- comedi/drivers/ke_counter.c | 16 ++-------------- comedi/drivers/me_daq.c | 15 ++------------- comedi/drivers/mite.c | 10 +--------- comedi/drivers/mpc8260cpm.c | 12 ------------ comedi/drivers/multiq3.c | 14 ++------------ comedi/drivers/ni_670x.c | 13 +------------ comedi/drivers/ni_at_a2150.c | 15 +++------------ comedi/drivers/ni_at_ao.c | 16 ++-------------- comedi/drivers/ni_atmio.c | 16 +++++----------- comedi/drivers/ni_atmio16d.c | 15 +++------------ comedi/drivers/ni_daq_dio24.c | 21 +++------------------ comedi/drivers/ni_labpc.c | 24 +++--------------------- comedi/drivers/ni_mio_common.c | 2 -- comedi/drivers/ni_mio_cs.c | 15 +++------------ comedi/drivers/ni_pcidio.c | 13 +++---------- comedi/drivers/ni_pcimio.c | 11 +---------- comedi/drivers/pcl711.c | 14 +++----------- comedi/drivers/pcl724.c | 14 +++----------- comedi/drivers/pcl725.c | 14 ++------------ comedi/drivers/pcl726.c | 14 ++------------ comedi/drivers/pcl812.c | 16 ++++------------ comedi/drivers/pcl816.c | 5 +++-- comedi/drivers/pcl818.c | 5 +++-- comedi/drivers/pcm3730.c | 14 ++------------ comedi/drivers/pcmad.c | 12 +----------- comedi/drivers/poc.c | 14 ++------------ comedi/drivers/quatech_daqp_cs.c | 15 +-------------- comedi/drivers/rtd520.c | 18 +++--------------- comedi/drivers/rti800.c | 14 ++------------ comedi/drivers/rti802.c | 14 ++------------ comedi/drivers/serial2002.c | 17 +++-------------- comedi/drivers/skel.c | 16 ++-------------- comedi/drivers/ssv_dnp.c | 12 ------------ comedi/kcomedilib/get.c | 2 +- comedi/proc.c | 3 ++- include/linux/comedidev.h | 4 ++++ scripts/check_driver | 15 +++++++++++++++ 77 files changed, 162 insertions(+), 768 deletions(-) diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c index cfb5444f..146c0f75 100644 --- a/comedi/comedi_ksyms.c +++ b/comedi/comedi_ksyms.c @@ -22,12 +22,9 @@ */ +#define __NO_VERSION__ #include -#include -#include -#include - diff --git a/comedi/drivers/8255.c b/comedi/drivers/8255.c index 56703678..67941006 100644 --- a/comedi/drivers/8255.c +++ b/comedi/drivers/8255.c @@ -78,20 +78,10 @@ I/O port base address can be found in the output of 'lspci -v'. will copy the latched value to a Comedi buffer. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define _8255_SIZE 4 diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c index dffdde95..12f9e1c2 100644 --- a/comedi/drivers/adl_pci9111.c +++ b/comedi/drivers/adl_pci9111.c @@ -75,20 +75,11 @@ TODO: */ -#include -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include #include -#include -#include + #include "8253.h" typedef enum diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c index e87ad89a..23b6cc6f 100644 --- a/comedi/drivers/adl_pci9118.c +++ b/comedi/drivers/adl_pci9118.c @@ -63,21 +63,10 @@ Configuration options: */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include #include + +#include + #include "amcc_s5933.h" #include "8253.h" diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c index 91309da3..45c64bdc 100644 --- a/comedi/drivers/adv_pci1710.c +++ b/comedi/drivers/adv_pci1710.c @@ -41,20 +41,10 @@ Configuration options: device will be used. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include + #include "8253.h" #include "amcc_s5933.h" diff --git a/comedi/drivers/amcc_s5933.c b/comedi/drivers/amcc_s5933.c index 7766e806..5aae1258 100644 --- a/comedi/drivers/amcc_s5933.c +++ b/comedi/drivers/amcc_s5933.c @@ -12,11 +12,9 @@ example. */ -#include -#include +#include #include -#include #include "amcc_s5933.h" diff --git a/comedi/drivers/amcc_s5933.h b/comedi/drivers/amcc_s5933.h index af898c70..ddf96784 100644 --- a/comedi/drivers/amcc_s5933.h +++ b/comedi/drivers/amcc_s5933.h @@ -15,8 +15,8 @@ #ifndef _AMCC_S5933_H_ #define _AMCC_S5933_H_ -#include #include +#include /****************************************************************************/ diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c index f3e9737c..4277ce2a 100644 --- a/comedi/drivers/amplc_pc236.c +++ b/comedi/drivers/amplc_pc236.c @@ -52,22 +52,10 @@ the IRQ jumper. If no interrupt is connected, then subdevice 1 is unused. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #include "8255.h" #include "plx9052.h" diff --git a/comedi/drivers/amplc_pc263.c b/comedi/drivers/amplc_pc263.c index c0dfc459..cfe46a7b 100644 --- a/comedi/drivers/amplc_pc263.c +++ b/comedi/drivers/amplc_pc263.c @@ -44,22 +44,10 @@ connected to a reed-relay. Relay contacts are closed when output is 1. The state of the outputs can be read. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define PC263_DRIVER_NAME "amplc_pc263" /* PCI263 PCI configuration register information */ diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c index 39afc9c3..be2b66c5 100644 --- a/comedi/drivers/amplc_pci230.c +++ b/comedi/drivers/amplc_pci230.c @@ -31,22 +31,10 @@ Status: unknown */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include +#include +#include #include "8253.h" #include "8255.h" diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c index ca313cfd..eacb804c 100644 --- a/comedi/drivers/cb_das16_cs.c +++ b/comedi/drivers/cb_das16_cs.c @@ -31,21 +31,9 @@ Status: experimental */ -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include #include -#include -#include #include #include diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c index f24baa81..6a1d13df 100644 --- a/comedi/drivers/cb_pcidas.c +++ b/comedi/drivers/cb_pcidas.c @@ -78,21 +78,10 @@ TODO: analog triggering on 1602 series */ -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include #include -#include -#include -#include + #include "8253.h" #include "8255.h" #include "amcc_s5933.h" diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c index 3cad80be..470a339a 100644 --- a/comedi/drivers/cb_pcidas64.c +++ b/comedi/drivers/cb_pcidas64.c @@ -76,21 +76,10 @@ TODO: */ -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include #include -#include -#include -#include + #include "8253.h" #include "8255.h" #include "plx9080.h" diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c index f2c85850..3a716618 100644 --- a/comedi/drivers/cb_pcidda.c +++ b/comedi/drivers/cb_pcidda.c @@ -46,21 +46,8 @@ Please report sucess/failure with other different cards to . */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include "8255.h" diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c index c500e022..bfe416ca 100644 --- a/comedi/drivers/cb_pcimdas.c +++ b/comedi/drivers/cb_pcimdas.c @@ -40,21 +40,10 @@ No interrupts, multi channel or FIFO AI, although the card looks like it could s See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include + #include "plx9052.h" //#define CBPCIMDAS_DEBUG diff --git a/comedi/drivers/cb_pcimdda.c b/comedi/drivers/cb_pcimdda.c index aca208e7..e8b8c944 100644 --- a/comedi/drivers/cb_pcimdda.c +++ b/comedi/drivers/cb_pcimdda.c @@ -85,21 +85,10 @@ Configuration Options: -Calin Culianu */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include + #include "8255.h" diff --git a/comedi/drivers/comedi_fc.c b/comedi/drivers/comedi_fc.c index 56178119..b85299e9 100644 --- a/comedi/drivers/comedi_fc.c +++ b/comedi/drivers/comedi_fc.c @@ -24,10 +24,9 @@ ************************************************************************/ -#include -#include +#include + #include "comedi_fc.h" -#include "linux/comedidev.h" static inline unsigned int bytes_per_scan( comedi_subdevice *subd ) { diff --git a/comedi/drivers/comedi_fc.h b/comedi/drivers/comedi_fc.h index 3cf3d7b6..fa041130 100644 --- a/comedi/drivers/comedi_fc.h +++ b/comedi/drivers/comedi_fc.h @@ -26,7 +26,7 @@ ************************************************************************/ -#include "linux/comedidev.h" +#include /* Writes an array of data points to comedi's buffer */ extern unsigned int cfc_write_array_to_buffer( comedi_subdevice *subd, void *data, diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c index a3873dbc..bb1d8e22 100644 --- a/comedi/drivers/comedi_parport.c +++ b/comedi/drivers/comedi_parport.c @@ -81,19 +81,8 @@ pin, which can be used to wake up tasks. or http://www.linux-magazin.de/ausgabe/1999/10/IO/io.html */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #define PARPORT_SIZE 3 diff --git a/comedi/drivers/comedi_rt_timer.c b/comedi/drivers/comedi_rt_timer.c index a832614c..d221edab 100644 --- a/comedi/drivers/comedi_rt_timer.c +++ b/comedi/drivers/comedi_rt_timer.c @@ -53,9 +53,6 @@ TODO: */ -#include -#include -#include #include #include #ifdef CONFIG_COMEDI_RTL_V1 diff --git a/comedi/drivers/comedi_test.c b/comedi/drivers/comedi_test.c index 5d879e06..4984092c 100644 --- a/comedi/drivers/comedi_test.c +++ b/comedi/drivers/comedi_test.c @@ -50,18 +50,10 @@ zero volts). */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + #include + #include "comedi_fc.h" /* Board descriptions */ diff --git a/comedi/drivers/contec_pci_dio.c b/comedi/drivers/contec_pci_dio.c index 01124182..85362c88 100644 --- a/comedi/drivers/contec_pci_dio.c +++ b/comedi/drivers/contec_pci_dio.c @@ -31,22 +31,10 @@ Configuration Options: none */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + typedef enum contec_model { PIO1616L =0, } contec_model; diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c index ae11e191..9828e28b 100644 --- a/comedi/drivers/daqboard2000.c +++ b/comedi/drivers/daqboard2000.c @@ -115,22 +115,11 @@ Configuration options: */ -#include -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include #include -#include -#include -#include -#include + #include "8255.h" #ifdef CONFIG_COMEDI_DAQBOARD2000_FPGA #include "daqboard2000_fpga.h" diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c index 13811ac8..1b871623 100644 --- a/comedi/drivers/das08.c +++ b/comedi/drivers/das08.c @@ -53,17 +53,10 @@ comedi_rt_timer driver can be used to emulate commands for this driver. */ -#include -#include #include -#include -#include -#include + #include #include -#include - -#include #include "8255.h" diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c index a8187660..c0f8b72a 100644 --- a/comedi/drivers/das16.c +++ b/comedi/drivers/das16.c @@ -83,16 +83,10 @@ Computer boards manuals also available from their website www.measurementcomputi */ -#include -#include #include -#include -#include -#include -#include -#include #include #include + #include "8253.h" #include "8255.h" #include "comedi_fc.h" diff --git a/comedi/drivers/das16m1.c b/comedi/drivers/das16m1.c index bb8a4985..56488e71 100644 --- a/comedi/drivers/das16m1.c +++ b/comedi/drivers/das16m1.c @@ -58,14 +58,9 @@ Options: irq can be omitted, although the cmd interface will not work without it. */ -#include -#include #include -#include #include -#include -#include -#include + #include "8255.h" #include "8253.h" #include "comedi_fc.h" diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c index 11dd0d22..a5d16d8e 100644 --- a/comedi/drivers/das1800.c +++ b/comedi/drivers/das1800.c @@ -99,20 +99,11 @@ TODO: read insn for analog out */ -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include -#include -#include #include -#include + #include "8253.h" #include "comedi_fc.h" diff --git a/comedi/drivers/das6402.c b/comedi/drivers/das6402.c index 1ae87e24..6dd70607 100644 --- a/comedi/drivers/das6402.c +++ b/comedi/drivers/das6402.c @@ -38,13 +38,9 @@ Devices: [Keithley Metrabyte] DAS6402 (das6402) This driver has suffered bitrot. */ -#include #include -#include -#include + #include -#include -#include #define DAS6402_SIZE 16 diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c index b1980f56..35e810ff 100644 --- a/comedi/drivers/das800.c +++ b/comedi/drivers/das800.c @@ -61,19 +61,11 @@ cmd triggers supported: */ -#include -#include -#include -#include -#include -#include +#include + #include #include -#include -#include -#include -#include -#include + #include "8253.h" #include "comedi_fc.h" diff --git a/comedi/drivers/dt2801.c b/comedi/drivers/dt2801.c index e2ca8013..be3ca4c0 100644 --- a/comedi/drivers/dt2801.c +++ b/comedi/drivers/dt2801.c @@ -29,10 +29,8 @@ Configuration options: */ #include -#include #include #include -#include #define DT2801_TIMEOUT 1000 diff --git a/comedi/drivers/dt2811.c b/comedi/drivers/dt2811.c index 656eadd5..948dca77 100644 --- a/comedi/drivers/dt2811.c +++ b/comedi/drivers/dt2811.c @@ -45,20 +45,10 @@ Configuration options: [4] - D/A 1 range (same choices) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + static char *driver_name = "dt2811"; static comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 4, { diff --git a/comedi/drivers/dt2814.c b/comedi/drivers/dt2814.c index 36aa270b..c7ef753a 100644 --- a/comedi/drivers/dt2814.c +++ b/comedi/drivers/dt2814.c @@ -39,21 +39,10 @@ a power of 10, from 1 to 10^7, of which only 3 or 4 are useful. In addition, the clock does not seem to be very accurate. */ +#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include - #define DT2814_SIZE 2 diff --git a/comedi/drivers/dt2815.c b/comedi/drivers/dt2815.c index 2beb1576..c02ae551 100644 --- a/comedi/drivers/dt2815.c +++ b/comedi/drivers/dt2815.c @@ -56,19 +56,10 @@ Configuration options: [12] - Analog output 7 range configuration (same options) */ -#include -#include -#include -#include -#include -#include +#include + #include #include -#include -#include -#include -#include -#include static comedi_lrange range_dt2815_ao_32_current = { 1, { diff --git a/comedi/drivers/dt2817.c b/comedi/drivers/dt2817.c index 9ea3cd7c..a0a95613 100644 --- a/comedi/drivers/dt2817.c +++ b/comedi/drivers/dt2817.c @@ -38,20 +38,10 @@ Configuration options: [0] - I/O port base base address */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define DT2817_SIZE 5 diff --git a/comedi/drivers/dt282x.c b/comedi/drivers/dt282x.c index c4e71ae9..5025933e 100644 --- a/comedi/drivers/dt282x.c +++ b/comedi/drivers/dt282x.c @@ -54,18 +54,9 @@ Notes: */ #include -#include -#include -#include -#include -#include -#include + #include -#include #include -#include -#include -#include #include #define DEBUG diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c index 7598e292..06e64b31 100644 --- a/comedi/drivers/dt3000.c +++ b/comedi/drivers/dt3000.c @@ -53,12 +53,10 @@ AO commands are not supported. #define DEBUG 1 #include -#include + #include #include -#include -#include #define PCI_VENDOR_ID_DT 0x1116 diff --git a/comedi/drivers/fl512.c b/comedi/drivers/fl512.c index d16046cf..7c9e356d 100644 --- a/comedi/drivers/fl512.c +++ b/comedi/drivers/fl512.c @@ -16,20 +16,11 @@ Configuration options: [0] - I/O port base address */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include + #define FL512_SIZE 16 /* the size of the used memory */ typedef struct { sampl_t ao_readback[2]; diff --git a/comedi/drivers/icp_multi.c b/comedi/drivers/icp_multi.c index 8c43c9fc..a0ad8dde 100644 --- a/comedi/drivers/icp_multi.c +++ b/comedi/drivers/icp_multi.c @@ -34,20 +34,10 @@ Options: [1] - PCI slot number */ -#include -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include #include -#include -#include #include "icp_multi.h" diff --git a/comedi/drivers/icp_multi.h b/comedi/drivers/icp_multi.h index 6cb28061..0307aa2b 100644 --- a/comedi/drivers/icp_multi.h +++ b/comedi/drivers/icp_multi.h @@ -10,8 +10,8 @@ #ifndef _ICP_MULTI_H_ #define _ICP_MULTI_H_ -#include #include +#include diff --git a/comedi/drivers/ii_pci20kc.c b/comedi/drivers/ii_pci20kc.c index 80ad5e0c..a5bb10de 100644 --- a/comedi/drivers/ii_pci20kc.c +++ b/comedi/drivers/ii_pci20kc.c @@ -81,13 +81,6 @@ options for PCI-20341M: #include -#include /* modularer Kernel */ -#include /* printk() */ -#include /* error codes */ -#include /* udelay() */ - -#include /* readb() ... */ - #define PCI20000_ID 0x1d #define PCI20341_ID 0x77 diff --git a/comedi/drivers/ke_counter.c b/comedi/drivers/ke_counter.c index e84cade4..9d6c46cf 100644 --- a/comedi/drivers/ke_counter.c +++ b/comedi/drivers/ke_counter.c @@ -32,22 +32,10 @@ This driver is a simple driver to read the counter values from Kolter Electronic PCI Counter Card. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define CNT_DRIVER_NAME "ke_counter" #define PCI_VENDOR_ID_KOLTER 0x1001 #define CNT_CARD_DEVICE_ID 0x0014 diff --git a/comedi/drivers/me_daq.c b/comedi/drivers/me_daq.c index e43e1c9d..7b3ecaa7 100644 --- a/comedi/drivers/me_daq.c +++ b/comedi/drivers/me_daq.c @@ -43,21 +43,10 @@ Configuration options: device will be used. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #include "me2600_fw.h" #define ME_DRIVER_NAME "me_daq" diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c index bf92e7da..bddef9c9 100644 --- a/comedi/drivers/mite.c +++ b/comedi/drivers/mite.c @@ -51,16 +51,8 @@ //#define USE_KMALLOC #include -#include -#include -#include -#include -#include -#include -#include + #include -#include -#include #include "mite.h" diff --git a/comedi/drivers/mpc8260cpm.c b/comedi/drivers/mpc8260cpm.c index 6752504d..b88bf567 100644 --- a/comedi/drivers/mpc8260cpm.c +++ b/comedi/drivers/mpc8260cpm.c @@ -34,18 +34,6 @@ you to access the processor's generic digital I/O lines. It is apparently missing some code. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include diff --git a/comedi/drivers/multiq3.c b/comedi/drivers/multiq3.c index bd0011b6..362db58b 100644 --- a/comedi/drivers/multiq3.c +++ b/comedi/drivers/multiq3.c @@ -29,20 +29,10 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define MULTIQ3_SIZE 16 diff --git a/comedi/drivers/ni_670x.c b/comedi/drivers/ni_670x.c index fcbd178e..75a0e1ad 100644 --- a/comedi/drivers/ni_670x.c +++ b/comedi/drivers/ni_670x.c @@ -38,19 +38,8 @@ Commands are not supported. Bart Joris Last updated on 20/08/2001 */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include + #include "mite.h" #define PCI_VENDOR_ID_NATINST 0x1093 diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c index 6cd12a1f..d97fd126 100644 --- a/comedi/drivers/ni_at_a2150.c +++ b/comedi/drivers/ni_at_a2150.c @@ -63,20 +63,11 @@ TRIG_WAKE_EOS */ -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include -#include -#include #include -#include + #include "8253.h" #include "comedi_fc.h" diff --git a/comedi/drivers/ni_at_ao.c b/comedi/drivers/ni_at_ao.c index 8e1f2f8d..711898c0 100644 --- a/comedi/drivers/ni_at_ao.c +++ b/comedi/drivers/ni_at_ao.c @@ -36,22 +36,10 @@ This driver has not been tested, but should work. * document 320379.pdf. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + /* board egisters */ /* registers with _2_ are accessed when GRP2WR is set in CFG1 */ diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c index 05e88762..7da17e6c 100644 --- a/comedi/drivers/ni_atmio.c +++ b/comedi/drivers/ni_atmio.c @@ -82,20 +82,14 @@ are not supported. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include #ifdef HAVE_ISAPNP -#include -#include +//#include +//#include #endif + #include "ni_stc.h" #include "8255.h" diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c index 2faf093a..bb0ec276 100644 --- a/comedi/drivers/ni_atmio16d.c +++ b/comedi/drivers/ni_atmio16d.c @@ -35,19 +35,10 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d) * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include + #include "8255.h" diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c index ec48de1b..ae8d8b9e 100644 --- a/comedi/drivers/ni_daq_dio24.c +++ b/comedi/drivers/ni_daq_dio24.c @@ -40,26 +40,11 @@ the PCMCIA interface. //#define LABPC_DEBUG // enable debugging messages #undef LABPC_DEBUG -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include "8255.h" -#include -#include -#include -#include +#include + +#include "8255.h" #include #include diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c index eefda827..7a628c14 100644 --- a/comedi/drivers/ni_labpc.c +++ b/comedi/drivers/ni_labpc.c @@ -70,21 +70,11 @@ NI manuals: #undef LABPC_DEBUG //#define LABPC_DEBUG // enable debugging messages -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include #include + #include "8253.h" #include "8255.h" #include "mite.h" @@ -92,14 +82,6 @@ NI manuals: #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) -//#include -//#include - -#include -#include -#include -#include - #include #include #include diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index b84f7327..146d2e39 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -56,8 +56,6 @@ //#define DEBUG_STATUS_A //#define DEBUG_STATUS_B -#include - #include "8255.h" #include "mite.h" diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c index a3532da0..9f907b1e 100644 --- a/comedi/drivers/ni_mio_cs.c +++ b/comedi/drivers/ni_mio_cs.c @@ -41,19 +41,10 @@ See the notes in the ni_atmio.o driver. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_COMEDI_RTL -#include -#endif #include + +#include + #include "ni_stc.h" #include "8255.h" diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c index 86e92996..288f22b0 100644 --- a/comedi/drivers/ni_pcidio.c +++ b/comedi/drivers/ni_pcidio.c @@ -64,17 +64,10 @@ AT-MIO96. #define DEBUG 1 #define DEBUG_FLAGS -#include -#include #include -#include -#include -#include -#include -#include -#include - -#include + +#include /* for disable_irq */ + #include "mite.h" #include "8255.h" diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c index 538b5742..13b8efcd 100644 --- a/comedi/drivers/ni_pcimio.c +++ b/comedi/drivers/ni_pcimio.c @@ -93,18 +93,9 @@ Bugs: */ -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include +#include #include "ni_stc.h" #include "mite.h" diff --git a/comedi/drivers/pcl711.c b/comedi/drivers/pcl711.c index 818fd63b..9c934736 100644 --- a/comedi/drivers/pcl711.c +++ b/comedi/drivers/pcl711.c @@ -58,19 +58,11 @@ supported. */ -#include -#include -#include -#include -#include -#include +#include + #include #include -#include -#include -#include -#include -#include + #include "8253.h" diff --git a/comedi/drivers/pcl724.c b/comedi/drivers/pcl724.c index 2f201099..b28bc1ee 100644 --- a/comedi/drivers/pcl724.c +++ b/comedi/drivers/pcl724.c @@ -39,19 +39,11 @@ See the source for configuration details. * comedi_insn */ -#include -#include -#include -#include -#include -#include +#include + #include #include -#include -#include -#include -#include -#include + #include "8255.h" #define PCL722_SIZE 32 diff --git a/comedi/drivers/pcl725.c b/comedi/drivers/pcl725.c index 416e7c78..3575aa96 100644 --- a/comedi/drivers/pcl725.c +++ b/comedi/drivers/pcl725.c @@ -10,20 +10,10 @@ Status: unknown Devices: [Advantech] PCL-725 (pcl725) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define PCL725_SIZE 2 diff --git a/comedi/drivers/pcl726.c b/comedi/drivers/pcl726.c index fa610caa..6bb7811a 100644 --- a/comedi/drivers/pcl726.c +++ b/comedi/drivers/pcl726.c @@ -67,20 +67,10 @@ Interrupts are not supported. their web page. (http://www.cir.com/) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #undef ACL6126_IRQ /* no interrupt support (yet) */ diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c index 6ec62498..d6391f17 100644 --- a/comedi/drivers/pcl812.c +++ b/comedi/drivers/pcl812.c @@ -110,20 +110,12 @@ See the head of the source file pcl812.c for configuration options. * */ -#include -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include -#include +#include #include -#include + #include "8253.h" diff --git a/comedi/drivers/pcl816.c b/comedi/drivers/pcl816.c index 1056aa89..8da634f4 100644 --- a/comedi/drivers/pcl816.c +++ b/comedi/drivers/pcl816.c @@ -34,12 +34,13 @@ Configuration Options: #define DEBUG(x) x +#include + #include -#include #include #include #include -#include + #include "8253.h" diff --git a/comedi/drivers/pcl818.c b/comedi/drivers/pcl818.c index 08ccd159..8ce26613 100644 --- a/comedi/drivers/pcl818.c +++ b/comedi/drivers/pcl818.c @@ -98,12 +98,13 @@ A word or two about DMA. Driver support DMA operations at two ways: */ +#include + #include -#include #include #include #include -#include + #include "8253.h" // #define PCL818_MODE13_AO 1 diff --git a/comedi/drivers/pcm3730.c b/comedi/drivers/pcm3730.c index 2a374421..9a037050 100644 --- a/comedi/drivers/pcm3730.c +++ b/comedi/drivers/pcm3730.c @@ -14,20 +14,10 @@ Configuration options: [0] - I/O port base */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define PCM3730_SIZE 4 // consecutive io port addresses diff --git a/comedi/drivers/pcmad.c b/comedi/drivers/pcmad.c index 4c7d22f4..abe5b6ca 100644 --- a/comedi/drivers/pcmad.c +++ b/comedi/drivers/pcmad.c @@ -42,19 +42,9 @@ Configuration options: */ -#include -#include #include -#include -#include -#include -#include + #include -#include -#include -#include -#include -#include #define PCMAD_SIZE 4 diff --git a/comedi/drivers/poc.c b/comedi/drivers/poc.c index 1bc52fa5..c3ee262f 100644 --- a/comedi/drivers/poc.c +++ b/comedi/drivers/poc.c @@ -38,20 +38,10 @@ Configuration options: [0] - I/O port base */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + static int poc_attach(comedi_device *dev,comedi_devconfig *it); static int poc_detach(comedi_device *dev); static int readback_insn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data); diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c index 899179a6..556df5af 100644 --- a/comedi/drivers/quatech_daqp_cs.c +++ b/comedi/drivers/quatech_daqp_cs.c @@ -35,19 +35,7 @@ Status: unkown Devices: [Quatech] DAQP-208 (daqp), DAQP-308 */ -//#include -//#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include @@ -56,7 +44,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308 #include #include -#include /* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c index 33a50eff..df315404 100644 --- a/comedi/drivers/rtd520.c +++ b/comedi/drivers/rtd520.c @@ -101,23 +101,11 @@ Configuration options: */ -#include -#include -#include -#include -#include -#include -#include +#include + #include -#include -#include -#include #include -#include -#include -#include -#include /*====================================================================== @@ -1036,7 +1024,7 @@ static int rtd_attach ( return 1; /* hit an error, clean up memory and return ret */ -rtd_attach_die_error: +//rtd_attach_die_error: #ifdef USE_DMA for(index = 0; index < DMA_CHAIN_COUNT; index++) { if (NULL != devpriv->dma0Buff[index]) { /* free buffer memory*/ diff --git a/comedi/drivers/rti800.c b/comedi/drivers/rti800.c index c5d16207..6db09403 100644 --- a/comedi/drivers/rti800.c +++ b/comedi/drivers/rti800.c @@ -51,20 +51,10 @@ Configuration options: [7] - DAC 1 encoding (same as DAC 0) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define RTI800_SIZE 16 diff --git a/comedi/drivers/rti802.c b/comedi/drivers/rti802.c index 684b2e62..34fd615c 100644 --- a/comedi/drivers/rti802.c +++ b/comedi/drivers/rti802.c @@ -37,20 +37,10 @@ Configuration Options: [17] - dac#7 ... */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + #define RTI802_SIZE 4 diff --git a/comedi/drivers/serial2002.c b/comedi/drivers/serial2002.c index 009c7b21..b1ec5eb7 100644 --- a/comedi/drivers/serial2002.c +++ b/comedi/drivers/serial2002.c @@ -31,22 +31,11 @@ Status: in development */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include + /* * Board descriptions for two imaginary boards. Describing the diff --git a/comedi/drivers/skel.c b/comedi/drivers/skel.c index 8f6ebc7c..c0458a4f 100644 --- a/comedi/drivers/skel.c +++ b/comedi/drivers/skel.c @@ -72,22 +72,10 @@ Configuration Options: * options that are used with comedi_config. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include /* for PCI devices */ + /* Imaginary registers for the imaginary board */ diff --git a/comedi/drivers/ssv_dnp.c b/comedi/drivers/ssv_dnp.c index 4d5b8735..5a155d49 100644 --- a/comedi/drivers/ssv_dnp.c +++ b/comedi/drivers/ssv_dnp.c @@ -31,18 +31,6 @@ Status: unknown /* include files ----------------------------------------------------------- */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include diff --git a/comedi/kcomedilib/get.c b/comedi/kcomedilib/get.c index 62f2b000..4a93d5fa 100644 --- a/comedi/kcomedilib/get.c +++ b/comedi/kcomedilib/get.c @@ -21,7 +21,7 @@ */ - +#define __NO_VERSION__ #include #include #include diff --git a/comedi/proc.c b/comedi/proc.c index a3410d40..8c53af03 100644 --- a/comedi/proc.c +++ b/comedi/proc.c @@ -29,9 +29,10 @@ */ +#define __NO_VERSION__ #include #include -#include +//#include #if LINUX_VERSION_CODE < 0x020100 diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h index 1fbdbd0a..a4fe7668 100644 --- a/include/linux/comedidev.h +++ b/include/linux/comedidev.h @@ -24,6 +24,8 @@ #ifndef _COMEDIDEV_H #define _COMEDIDEV_H +#include +#include #include #include #include @@ -35,7 +37,9 @@ #include #include #include + #include +#include #include diff --git a/scripts/check_driver b/scripts/check_driver index 0edb5589..acc1120f 100755 --- a/scripts/check_driver +++ b/scripts/check_driver @@ -403,3 +403,18 @@ if grep 'COMEDI_SUBD_AI' ${driver} &>/dev/null;then fi fi +if grep -e 'include..linux.version.h' \ + -e 'include..linux.config.h' \ + -e 'include..linux.kdev_t.h' \ + -e 'include..linux.slab.h' \ + -e 'include..linux.errno.h' \ + -e 'include..linux.spinlock.h' \ + -e 'include..linux.wait.h' \ + -e 'include..linux.mm.h' \ + -e 'include..linux.init.h' \ + -e 'include..linux.vmalloc.h' \ + -e 'include..asm.uaccess.h' \ + ${driver} &>/dev/null;then + echo "W: Driver #includes headers included by comedidev.h" +fi + -- 2.26.2