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

comedi: Move and rename "8255.h" to <linux/comedi/comedi_8255.h> 



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 Comedi device drivers that use the
"comedi_8255" module to add digital I/O subdevices based on the
venerable 8255 Programmable Peripheral Interface chip.  The macros and
declarations to use that module are in the "8255.h" header file in the
comedi "drivers" directory.  Move it into "include/linux/comedi/" and
rename it to "comedi_8255.h" for naming consistency reasons.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20211117120604.117740-4-abbotti@mev.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55d0f80e

drivers/comedi/drivers/8255.c

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ 


#include <linux/module.h>

#include <linux/comedi/comedidev.h>



#include "8255.h"

#include <linux/comedi/comedi_8255.h>



static int dev_8255_attach(struct comedi_device *dev,

			   struct comedi_devconfig *it)

drivers/comedi/drivers/8255_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ 


#include <linux/module.h>

#include <linux/comedi/comedi_pci.h>



#include "8255.h"

#include <linux/comedi/comedi_8255.h>



enum pci_8255_boardid {

	BOARD_ADLINK_PCI7224,

drivers/comedi/drivers/adv_pci_dio.c

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/comedi/comedi_pci.h>

#include <linux/comedi/comedi_8255.h>



#include "8255.h"

#include "comedi_8254.h"



/*

drivers/comedi/drivers/aio_aio12_8.c

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 


#include <linux/module.h>

#include <linux/comedi/comedidev.h>

#include <linux/comedi/comedi_8255.h>



#include "comedi_8254.h"

#include "8255.h"



/*

 * Register map

drivers/comedi/drivers/amplc_dio200_common.c

+1 −1
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ 
#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/comedi/comedidev.h>

#include <linux/comedi/comedi_8255.h>	/* only for register defines */



#include "amplc_dio200.h"

#include "comedi_8254.h"

#include "8255.h"		/* only for register defines */



/* 200 series registers */

#define DIO200_IO_SIZE		0x20