tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20211117120604.117740-4-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ian Abbott and committed by
Greg Kroah-Hartman 631e272b 55d0f80e

+30 -40
+1 -2
drivers/comedi/drivers/8255.c
··· 41 41 42 42 #include <linux/module.h> 43 43 #include <linux/comedi/comedidev.h> 44 - 45 - #include "8255.h" 44 + #include <linux/comedi/comedi_8255.h> 46 45 47 46 static int dev_8255_attach(struct comedi_device *dev, 48 47 struct comedi_devconfig *it)
+4 -4
drivers/comedi/drivers/8255.h include/linux/comedi/comedi_8255.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0+ */ 2 2 /* 3 - * module/8255.h 4 - * Header file for 8255 3 + * comedi_8255.h 4 + * Generic 8255 digital I/O subdevice support 5 5 * 6 6 * COMEDI - Linux Control and Measurement Device Interface 7 7 * Copyright (C) 1998 David A. Schleef <ds@schleef.org> 8 8 */ 9 9 10 - #ifndef _8255_H 11 - #define _8255_H 10 + #ifndef _COMEDI_8255_H 11 + #define _COMEDI_8255_H 12 12 13 13 #define I8255_SIZE 0x04 14 14
+1 -2
drivers/comedi/drivers/8255_pci.c
··· 54 54 55 55 #include <linux/module.h> 56 56 #include <linux/comedi/comedi_pci.h> 57 - 58 - #include "8255.h" 57 + #include <linux/comedi/comedi_8255.h> 59 58 60 59 enum pci_8255_boardid { 61 60 BOARD_ADLINK_PCI7224,
+1 -1
drivers/comedi/drivers/adv_pci_dio.c
··· 24 24 #include <linux/module.h> 25 25 #include <linux/delay.h> 26 26 #include <linux/comedi/comedi_pci.h> 27 + #include <linux/comedi/comedi_8255.h> 27 28 28 - #include "8255.h" 29 29 #include "comedi_8254.h" 30 30 31 31 /*
+1 -1
drivers/comedi/drivers/aio_aio12_8.c
··· 23 23 24 24 #include <linux/module.h> 25 25 #include <linux/comedi/comedidev.h> 26 + #include <linux/comedi/comedi_8255.h> 26 27 27 28 #include "comedi_8254.h" 28 - #include "8255.h" 29 29 30 30 /* 31 31 * Register map
+1 -1
drivers/comedi/drivers/amplc_dio200_common.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/comedi/comedidev.h> 16 + #include <linux/comedi/comedi_8255.h> /* only for register defines */ 16 17 17 18 #include "amplc_dio200.h" 18 19 #include "comedi_8254.h" 19 - #include "8255.h" /* only for register defines */ 20 20 21 21 /* 200 series registers */ 22 22 #define DIO200_IO_SIZE 0x20
+1 -1
drivers/comedi/drivers/amplc_pc236_common.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/interrupt.h> 14 14 #include <linux/comedi/comedidev.h> 15 + #include <linux/comedi/comedi_8255.h> 15 16 16 17 #include "amplc_pc236.h" 17 - #include "8255.h" 18 18 19 19 static void pc236_intr_update(struct comedi_device *dev, bool enable) 20 20 {
+1 -1
drivers/comedi/drivers/amplc_pci230.c
··· 175 175 #include <linux/delay.h> 176 176 #include <linux/interrupt.h> 177 177 #include <linux/comedi/comedi_pci.h> 178 + #include <linux/comedi/comedi_8255.h> 178 179 179 180 #include "comedi_8254.h" 180 - #include "8255.h" 181 181 182 182 /* 183 183 * PCI230 PCI configuration register information
+1 -1
drivers/comedi/drivers/cb_pcidas.c
··· 55 55 #include <linux/delay.h> 56 56 #include <linux/interrupt.h> 57 57 #include <linux/comedi/comedi_pci.h> 58 + #include <linux/comedi/comedi_8255.h> 58 59 59 60 #include "comedi_8254.h" 60 - #include "8255.h" 61 61 #include "amcc_s5933.h" 62 62 63 63 #define AI_BUFFER_SIZE 1024 /* max ai fifo size */
+1 -1
drivers/comedi/drivers/cb_pcidas64.c
··· 74 74 #include <linux/delay.h> 75 75 #include <linux/interrupt.h> 76 76 #include <linux/comedi/comedi_pci.h> 77 + #include <linux/comedi/comedi_8255.h> 77 78 78 - #include "8255.h" 79 79 #include "plx9080.h" 80 80 81 81 #define TIMER_BASE 25 /* 40MHz master clock */
+1 -2
drivers/comedi/drivers/cb_pcidda.c
··· 28 28 29 29 #include <linux/module.h> 30 30 #include <linux/comedi/comedi_pci.h> 31 - 32 - #include "8255.h" 31 + #include <linux/comedi/comedi_8255.h> 33 32 34 33 #define EEPROM_SIZE 128 /* number of entries in eeprom */ 35 34 /* maximum number of ao channels for supported boards */
+1 -1
drivers/comedi/drivers/cb_pcimdas.c
··· 35 35 #include <linux/module.h> 36 36 #include <linux/interrupt.h> 37 37 #include <linux/comedi/comedi_pci.h> 38 + #include <linux/comedi/comedi_8255.h> 38 39 39 40 #include "comedi_8254.h" 40 41 #include "plx9052.h" 41 - #include "8255.h" 42 42 43 43 /* 44 44 * PCI Bar 1 Register map
+1 -2
drivers/comedi/drivers/cb_pcimdda.c
··· 68 68 69 69 #include <linux/module.h> 70 70 #include <linux/comedi/comedi_pci.h> 71 - 72 - #include "8255.h" 71 + #include <linux/comedi/comedi_8255.h> 73 72 74 73 /* device ids of the cards we support -- currently only 1 card supported */ 75 74 #define PCI_ID_PCIM_DDA06_16 0x0053
+1 -2
drivers/comedi/drivers/comedi_8255.c
··· 30 30 31 31 #include <linux/module.h> 32 32 #include <linux/comedi/comedidev.h> 33 - 34 - #include "8255.h" 33 + #include <linux/comedi/comedi_8255.h> 35 34 36 35 struct subdev_8255_private { 37 36 unsigned long regbase;
+1 -1
drivers/comedi/drivers/daqboard2000.c
··· 97 97 #include <linux/delay.h> 98 98 #include <linux/interrupt.h> 99 99 #include <linux/comedi/comedi_pci.h> 100 + #include <linux/comedi/comedi_8255.h> 100 101 101 - #include "8255.h" 102 102 #include "plx9080.h" 103 103 104 104 #define DB2K_FIRMWARE "daqboard2000_firmware.bin"
+1 -1
drivers/comedi/drivers/das08.c
··· 11 11 12 12 #include <linux/module.h> 13 13 #include <linux/comedi/comedidev.h> 14 + #include <linux/comedi/comedi_8255.h> 14 15 15 - #include "8255.h" 16 16 #include "comedi_8254.h" 17 17 #include "das08.h" 18 18
+1 -1
drivers/comedi/drivers/das16.c
··· 64 64 #include <linux/slab.h> 65 65 #include <linux/interrupt.h> 66 66 #include <linux/comedi/comedidev.h> 67 + #include <linux/comedi/comedi_8255.h> 67 68 68 69 #include "comedi_isadma.h" 69 70 #include "comedi_8254.h" 70 - #include "8255.h" 71 71 72 72 #define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */ 73 73
+1 -1
drivers/comedi/drivers/das16m1.c
··· 43 43 #include <linux/slab.h> 44 44 #include <linux/interrupt.h> 45 45 #include <linux/comedi/comedidev.h> 46 + #include <linux/comedi/comedi_8255.h> 46 47 47 - #include "8255.h" 48 48 #include "comedi_8254.h" 49 49 50 50 /*
+1 -2
drivers/comedi/drivers/dmm32at.c
··· 30 30 #include <linux/delay.h> 31 31 #include <linux/interrupt.h> 32 32 #include <linux/comedi/comedidev.h> 33 - 34 - #include "8255.h" 33 + #include <linux/comedi/comedi_8255.h> 35 34 36 35 /* Board register addresses */ 37 36 #define DMM32AT_AI_START_CONV_REG 0x00
+1 -1
drivers/comedi/drivers/ni_atmio.c
··· 75 75 #include <linux/interrupt.h> 76 76 #include <linux/comedi/comedidev.h> 77 77 #include <linux/isapnp.h> 78 + #include <linux/comedi/comedi_8255.h> 78 79 79 80 #include "ni_stc.h" 80 - #include "8255.h" 81 81 82 82 /* AT specific setup */ 83 83 static const struct ni_board_struct ni_boards[] = {
+1 -2
drivers/comedi/drivers/ni_atmio16d.c
··· 40 40 #include <linux/module.h> 41 41 #include <linux/interrupt.h> 42 42 #include <linux/comedi/comedidev.h> 43 - 44 - #include "8255.h" 43 + #include <linux/comedi/comedi_8255.h> 45 44 46 45 /* Configuration and Status Registers */ 47 46 #define COM_REG_1 0x00 /* wo 16 */
+1 -2
drivers/comedi/drivers/ni_daq_dio24.c
··· 24 24 25 25 #include <linux/module.h> 26 26 #include <linux/comedi/comedi_pcmcia.h> 27 - 28 - #include "8255.h" 27 + #include <linux/comedi/comedi_8255.h> 29 28 30 29 static int dio24_auto_attach(struct comedi_device *dev, 31 30 unsigned long context)
+1 -1
drivers/comedi/drivers/ni_labpc_common.c
··· 13 13 #include <linux/delay.h> 14 14 #include <linux/slab.h> 15 15 #include <linux/comedi/comedidev.h> 16 + #include <linux/comedi/comedi_8255.h> 16 17 17 18 #include "comedi_8254.h" 18 - #include "8255.h" 19 19 #include "ni_labpc.h" 20 20 #include "ni_labpc_regs.h" 21 21 #include "ni_labpc_isadma.h"
+1 -1
drivers/comedi/drivers/ni_mio_common.c
··· 43 43 #include <linux/interrupt.h> 44 44 #include <linux/sched.h> 45 45 #include <linux/delay.h> 46 - #include "8255.h" 46 + #include <linux/comedi/comedi_8255.h> 47 47 #include "mite.h" 48 48 49 49 /* A timeout count */
+1 -1
drivers/comedi/drivers/ni_mio_cs.c
··· 29 29 #include <linux/module.h> 30 30 #include <linux/delay.h> 31 31 #include <linux/comedi/comedi_pcmcia.h> 32 + #include <linux/comedi/comedi_8255.h> 32 33 33 34 #include "ni_stc.h" 34 - #include "8255.h" 35 35 36 36 /* 37 37 * AT specific setup
+1 -2
drivers/comedi/drivers/pcl724.c
··· 26 26 27 27 #include <linux/module.h> 28 28 #include <linux/comedi/comedidev.h> 29 - 30 - #include "8255.h" 29 + #include <linux/comedi/comedi_8255.h> 31 30 32 31 struct pcl724_board { 33 32 const char *name;
+1 -2
drivers/comedi/drivers/pcm3724.c
··· 25 25 26 26 #include <linux/module.h> 27 27 #include <linux/comedi/comedidev.h> 28 - 29 - #include "8255.h" 28 + #include <linux/comedi/comedi_8255.h> 30 29 31 30 /* 32 31 * Register I/O Map