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

Commit f286766e authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove comedi_fops.h 



Move the contents of "comedi_fops.h" into "comedi_internal.h" and delete
"comedi_fops.h". It only contains a couple of external variable
declarations (and #include <linux/types.h>) and one of those isn't even
declared in "comedi_fops.c".  The other one is an external declaration
of a variable used to store a module parameter and some of those are
already externally declared in "comedi_internal.h", so they can keep it
company!

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 97ce84de

drivers/staging/comedi/comedi_fops.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#undef DEBUG



#define __NO_VERSION__

#include "comedi_fops.h"

#include "comedi_compat32.h"



#include <linux/module.h>

drivers/staging/comedi/comedi_fops.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 


#ifndef _COMEDI_FOPS_H

#define _COMEDI_FOPS_H

#include <linux/types.h>



extern bool comedi_autoconfig;

extern struct comedi_driver *comedi_drivers;



#endif /* _COMEDI_FOPS_H */

drivers/staging/comedi/comedi_internal.h

+4 −0
Original line number Diff line number Diff line 
#ifndef _COMEDI_INTERNAL_H

#define _COMEDI_INTERNAL_H



#include <linux/types.h>



/*

 * various internal comedi stuff

 */
@@ -17,5 +19,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, 


extern unsigned int comedi_default_buf_size_kb;

extern unsigned int comedi_default_buf_maxsize_kb;

extern bool comedi_autoconfig;

extern struct comedi_driver *comedi_drivers;



#endif /* _COMEDI_INTERNAL_H */

drivers/staging/comedi/drivers.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define _GNU_SOURCE



#define __NO_VERSION__

#include "comedi_fops.h"

#include <linux/device.h>

#include <linux/module.h>

#include <linux/pci.h>

drivers/staging/comedi/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#define __NO_VERSION__

#include "comedidev.h"

#include "comedi_fops.h"

#include "comedi_internal.h"

#include <linux/proc_fs.h>

#include <linux/string.h>