Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce157f80 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: don't rely on comedidev.h to include headers 



comedidev.h is the main kernel header for comedi. Every comedi
driver includes this header which then includes a number of
<linux/*> headers. All the drivers need <linux/module.h> and some
of them need <linux/delay.h>. The rest are not needed by any of
the drivers.

Remove all the includes in comedidev.h except for <linux/dma-mapping.h>,
which is needed to pick up the enum dma_data_direction for the
comedi_subdevice definition, and "comedi.h", which is the uapi
header for comedi.

Add <linux/module.h> to all the comedi drivers and <linux/delay.h>
to the couple that need it.

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 0bdab509

drivers/staging/comedi/comedidev.h

+0 −14
Original line number Diff line number Diff line
@@ -19,21 +19,7 @@ 
#ifndef _COMEDIDEV_H

#define _COMEDIDEV_H



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/kdev_t.h>

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>

#include <linux/wait.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <linux/vmalloc.h>

#include <linux/dma-mapping.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/timer.h>



#include "comedi.h"

drivers/staging/comedi/drivers/8255.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ I/O port base address can be found in the output of 'lspci -v'. 
   will copy the latched value to a Comedi buffer.

 */



#include <linux/module.h>

#include "../comedidev.h"



#include <linux/ioport.h>

drivers/staging/comedi/drivers/8255_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ Interrupt support for these boards is also not currently supported. 
Configuration Options: not applicable, uses PCI auto config

*/



#include <linux/module.h>

#include <linux/pci.h>



#include "../comedidev.h"

drivers/staging/comedi/drivers/addi-data/addi_eeprom.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 * for more details.

 */



#include <linux/delay.h>



#define NVRAM_USER_DATA_START	0x100



#define NVCMD_BEGIN_READ	(0x7 << 5)	/* nvRam begin read command */

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY 
  +----------+-----------+------------------------------------------------+

*/



#include <linux/delay.h>



/*

 * ADDON RELATED ADDITIONS

 */