LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
@ 2015-03-10 16:10 Ian Abbott
  2015-03-10 16:10 ` [PATCH 01/56] staging: comedi: add comedi_pci.h Ian Abbott
                   ` (57 more replies)
  0 siblings, 58 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

"comedidev.h" includes PCI-specific stuff that gets included by all
comedi drivers including non-PCI ones.  Separate it out into its own
header "comedi_pci.h".  Make the new header include <linux/pci.h> and
"comedidev.h" so that comedi PCI drivers do not need to include them
explicitly.

01) staging: comedi: add comedi_pci.h
02) staging: comedi: comedi_pci.c: include new "comedi_pci.h" header
03) staging: comedi: 8255_pci: include new "comedi_pci.h" header
04) staging: comedi: addi_apci_1032: include new "comedi_pci.h" header
05) staging: comedi: addi_apci_1500: include new "comedi_pci.h" header
06) staging: comedi: addi_apci_1516: include new "comedi_pci.h" header
07) staging: comedi: addi_apci_1564: include new "comedi_pci.h" header
08) staging: comedi: addi_apci_16xx: include new "comedi_pci.h" header
09) staging: comedi: addi_apci_2032: include new "comedi_pci.h" header
10) staging: comedi: addi_apci_2200: include new "comedi_pci.h" header
11) staging: comedi: addi_apci_3120: include new "comedi_pci.h" header
12) staging: comedi: addi_apci_3501: include new "comedi_pci.h" header
13) staging: comedi: addi_apci_3xxx: include new "comedi_pci.h" header
14) staging: comedi: adl_pci6208: include new "comedi_pci.h" header
15) staging: comedi: adl_pci7x3x: include new "comedi_pci.h" header
16) staging: comedi: adl_pci8164: include new "comedi_pci.h" header
17) staging: comedi: adl_pci9111: include new "comedi_pci.h" header
18) staging: comedi: adl_pci9118: include new "comedi_pci.h" header
19) staging: comedi: adv_pci1710: include new "comedi_pci.h" header
20) staging: comedi: adv_pci1723: include new "comedi_pci.h" header
21) staging: comedi: adv_pci1724: include new "comedi_pci.h" header
22) staging: comedi: adv_pci_dio: include new "comedi_pci.h" header
23) staging: comedi: amplc_dio200_pci: include new "comedi_pci.h" header
24) staging: comedi: amplc_pci224: include new "comedi_pci.h" header
25) staging: comedi: amplc_pci230: include new "comedi_pci.h" header
26) staging: comedi: amplc_pci236: include new "comedi_pci.h" header
27) staging: comedi: amplc_pci263: include new "comedi_pci.h" header
28) staging: comedi: cb_pcidas64: include new "comedi_pci.h" header
29) staging: comedi: cb_pcidas: include new "comedi_pci.h" header
30) staging: comedi: cb_pcidda: include new "comedi_pci.h" header
31) staging: comedi: cb_pcimdas: include new "comedi_pci.h" header
32) staging: comedi: cb_pcimdda: include new "comedi_pci.h" header
33) staging: comedi: contec_pci_dio: include new "comedi_pci.h" header
34) staging: comedi: daqboard2000: include new "comedi_pci.h" header
35) staging: comedi: das08_pci: include new "comedi_pci.h" header
36) staging: comedi: dt3000: include new "comedi_pci.h" header
37) staging: comedi: dyna_pci10xx: include new "comedi_pci.h" header
38) staging: comedi: gsc_hpdi: include new "comedi_pci.h" header
39) staging: comedi: icp_multi: include new "comedi_pci.h" header
40) staging: comedi: jr3_pci: include new "comedi_pci.h" header
41) staging: comedi: ke_counter: include new "comedi_pci.h" header
42) staging: comedi: me4000: include new "comedi_pci.h" header
43) staging: comedi: me_daq: include new "comedi_pci.h" header
44) staging: comedi: mf6x4: include new "comedi_pci.h" header
45) staging: comedi: mite.c: include new "comedi_pci.h" header
46) staging: comedi: mite.h: include new "comedi_pci.h" header
47) staging: comedi: ni_6527: include new "comedi_pci.h" header
48) staging: comedi: ni_65xx: include new "comedi_pci.h" header
49) staging: comedi: ni_660x: include new "comedi_pci.h" header
50) staging: comedi: ni_670x: include new "comedi_pci.h" header
51) staging: comedi: ni_labpc_pci: include new "comedi_pci.h" header
52) staging: comedi: ni_pcmdio: include new "comedi_pci.h" header
53) staging: comedi: ni_pcmmio: include new "comedi_pci.h" header
54) staging: comedi: rtd520: include new "comedi_pci.h" header
55) staging: comedi: s626: include new "comedi_pci.h" header
56) staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h

 drivers/staging/comedi/comedi_pci.c               |  3 +-
 drivers/staging/comedi/comedi_pci.h               | 64 +++++++++++++++++++++++
 drivers/staging/comedi/comedidev.h                | 43 ---------------
 drivers/staging/comedi/drivers/8255_pci.c         |  3 +-
 drivers/staging/comedi/drivers/addi_apci_1032.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_1500.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_1516.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_1564.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_16xx.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_2032.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_2200.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_3120.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_3501.c   |  3 +-
 drivers/staging/comedi/drivers/addi_apci_3xxx.c   |  3 +-
 drivers/staging/comedi/drivers/adl_pci6208.c      |  3 +-
 drivers/staging/comedi/drivers/adl_pci7x3x.c      |  3 +-
 drivers/staging/comedi/drivers/adl_pci8164.c      |  3 +-
 drivers/staging/comedi/drivers/adl_pci9111.c      |  3 +-
 drivers/staging/comedi/drivers/adl_pci9118.c      |  3 +-
 drivers/staging/comedi/drivers/adv_pci1710.c      |  3 +-
 drivers/staging/comedi/drivers/adv_pci1723.c      |  3 +-
 drivers/staging/comedi/drivers/adv_pci1724.c      |  3 +-
 drivers/staging/comedi/drivers/adv_pci_dio.c      |  3 +-
 drivers/staging/comedi/drivers/amplc_dio200_pci.c |  3 +-
 drivers/staging/comedi/drivers/amplc_pci224.c     |  3 +-
 drivers/staging/comedi/drivers/amplc_pci230.c     |  3 +-
 drivers/staging/comedi/drivers/amplc_pci236.c     |  3 +-
 drivers/staging/comedi/drivers/amplc_pci263.c     |  3 +-
 drivers/staging/comedi/drivers/cb_pcidas.c        |  3 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c      |  3 +-
 drivers/staging/comedi/drivers/cb_pcidda.c        |  3 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c       |  3 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c       |  3 +-
 drivers/staging/comedi/drivers/contec_pci_dio.c   |  3 +-
 drivers/staging/comedi/drivers/daqboard2000.c     |  3 +-
 drivers/staging/comedi/drivers/das08_pci.c        |  3 +-
 drivers/staging/comedi/drivers/dt3000.c           |  3 +-
 drivers/staging/comedi/drivers/dyna_pci10xx.c     |  3 +-
 drivers/staging/comedi/drivers/gsc_hpdi.c         |  3 +-
 drivers/staging/comedi/drivers/icp_multi.c        |  3 +-
 drivers/staging/comedi/drivers/jr3_pci.c          |  3 +-
 drivers/staging/comedi/drivers/ke_counter.c       |  3 +-
 drivers/staging/comedi/drivers/me4000.c           |  3 +-
 drivers/staging/comedi/drivers/me_daq.c           |  3 +-
 drivers/staging/comedi/drivers/mf6x4.c            |  4 +-
 drivers/staging/comedi/drivers/mite.c             |  3 +-
 drivers/staging/comedi/drivers/mite.h             |  3 +-
 drivers/staging/comedi/drivers/ni_6527.c          |  3 +-
 drivers/staging/comedi/drivers/ni_65xx.c          |  3 +-
 drivers/staging/comedi/drivers/ni_660x.c          |  3 +-
 drivers/staging/comedi/drivers/ni_670x.c          |  3 +-
 drivers/staging/comedi/drivers/ni_labpc_pci.c     |  3 +-
 drivers/staging/comedi/drivers/ni_pcidio.c        |  2 +-
 drivers/staging/comedi/drivers/ni_pcimio.c        |  2 +-
 drivers/staging/comedi/drivers/rtd520.c           |  3 +-
 drivers/staging/comedi/drivers/s626.c             |  3 +-
 56 files changed, 119 insertions(+), 149 deletions(-)

^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 01/56] staging: comedi: add comedi_pci.h
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 02/56] staging: comedi: comedi_pci.c: include new "comedi_pci.h" header Ian Abbott
                   ` (56 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Add a new header that Comedi PCI drivers can include instead of
"comedidev.h".  Currently, it just pulls in <linux/pci.h> and
"comedidev.h", but the plan is to migrate the PCI-specific stuff from
"comedidev.h" here.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/comedi_pci.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 drivers/staging/comedi/comedi_pci.h

diff --git a/drivers/staging/comedi/comedi_pci.h b/drivers/staging/comedi/comedi_pci.h
new file mode 100644
index 0000000..a083465
--- /dev/null
+++ b/drivers/staging/comedi/comedi_pci.h
@@ -0,0 +1,30 @@
+/*
+ * comedi_pci.h
+ * header file for Comedi PCI drivers
+ *
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 1997-2000 David A. Schleef <ds@schleef.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _COMEDI_PCI_H
+#define _COMEDI_PCI_H
+
+#include <linux/pci.h>
+
+#include "comedidev.h"
+
+/*
+ * TODO: Move PCI-specific stuff into here from "comedidev.h".
+ */
+
+#endif /* _COMEDI_PCI_H */
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 02/56] staging: comedi: comedi_pci.c: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
  2015-03-10 16:10 ` [PATCH 01/56] staging: comedi: add comedi_pci.h Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 03/56] staging: comedi: 8255_pci: " Ian Abbott
                   ` (55 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "comedi_pci.h" header instead of <linux/pci.h> and
"comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/comedi_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/comedi_pci.c b/drivers/staging/comedi/comedi_pci.c
index 6ba59c9..027f0f4 100644
--- a/drivers/staging/comedi/comedi_pci.c
+++ b/drivers/staging/comedi/comedi_pci.c
@@ -17,10 +17,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "comedidev.h"
+#include "comedi_pci.h"
 
 /**
  * comedi_to_pci_dev() - comedi_device pointer to pci_dev pointer.
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 03/56] staging: comedi: 8255_pci: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
  2015-03-10 16:10 ` [PATCH 01/56] staging: comedi: add comedi_pci.h Ian Abbott
  2015-03-10 16:10 ` [PATCH 02/56] staging: comedi: comedi_pci.c: include new "comedi_pci.h" header Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 04/56] staging: comedi: addi_apci_1032: " Ian Abbott
                   ` (54 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/8255_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index 291aed1..bb9854b 100644
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -62,9 +62,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "8255.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 04/56] staging: comedi: addi_apci_1032: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (2 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 03/56] staging: comedi: 8255_pci: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 05/56] staging: comedi: addi_apci_1500: " Ian Abbott
                   ` (53 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_1032.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 993ecc6..f82cee4 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -71,10 +71,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "comedi_fc.h"
 #include "amcc_s5933.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 05/56] staging: comedi: addi_apci_1500: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (3 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 04/56] staging: comedi: addi_apci_1032: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 06/56] staging: comedi: addi_apci_1516: " Ian Abbott
                   ` (52 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_1500.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 3dd0179..c71847e 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -22,10 +22,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "comedi_fc.h"
 #include "amcc_s5933.h"
 #include "z8536.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 06/56] staging: comedi: addi_apci_1516: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (4 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 05/56] staging: comedi: addi_apci_1500: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 07/56] staging: comedi: addi_apci_1564: " Ian Abbott
                   ` (51 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_1516.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index d841041..c3505a5 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -23,9 +23,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "addi_watchdog.h"
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 07/56] staging: comedi: addi_apci_1564: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (5 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 06/56] staging: comedi: addi_apci_1516: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 08/56] staging: comedi: addi_apci_16xx: " Ian Abbott
                   ` (50 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 2de5e83..c481c48 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -22,11 +22,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "comedi_fc.h"
 #include "addi_tcw.h"
 #include "addi_watchdog.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 08/56] staging: comedi: addi_apci_16xx: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (6 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 07/56] staging: comedi: addi_apci_1564: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 09/56] staging: comedi: addi_apci_2032: " Ian Abbott
                   ` (49 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index a1248da..c63133a 100644
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -23,9 +23,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * Register I/O map
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 09/56] staging: comedi: addi_apci_2032: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (7 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 08/56] staging: comedi: addi_apci_16xx: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 10/56] staging: comedi: addi_apci_2200: " Ian Abbott
                   ` (48 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_2032.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index eebf4f1..86abb72 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -23,11 +23,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "addi_watchdog.h"
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 10/56] staging: comedi: addi_apci_2200: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (8 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 09/56] staging: comedi: addi_apci_2032: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 11/56] staging: comedi: addi_apci_3120: " Ian Abbott
                   ` (47 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_2200.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 1f9d136..2b382a5 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -23,9 +23,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "addi_watchdog.h"
 
 /*
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 11/56] staging: comedi: addi_apci_3120: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (9 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 10/56] staging: comedi: addi_apci_2200: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 12/56] staging: comedi: addi_apci_3501: " Ian Abbott
                   ` (46 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_3120.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index c65f940..5822f1fe 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -22,10 +22,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "comedi_fc.h"
 #include "amcc_s5933.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 12/56] staging: comedi: addi_apci_3501: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (10 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 11/56] staging: comedi: addi_apci_3120: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 13/56] staging: comedi: addi_apci_3xxx: " Ian Abbott
                   ` (45 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_3501.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index b8f3366..08c9c58 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -23,11 +23,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 #include "comedi_fc.h"
 #include "amcc_s5933.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 13/56] staging: comedi: addi_apci_3xxx: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (11 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 12/56] staging: comedi: addi_apci_3501: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 14/56] staging: comedi: adl_pci6208: " Ian Abbott
                   ` (44 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index c173810..8dadab8 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -23,10 +23,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 14/56] staging: comedi: adl_pci6208: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (12 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 13/56] staging: comedi: addi_apci_3xxx: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 15/56] staging: comedi: adl_pci7x3x: " Ian Abbott
                   ` (43 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adl_pci6208.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index cc75281..7ed3fd6 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -33,9 +33,8 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * PCI-6208/6216-GL register map
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 15/56] staging: comedi: adl_pci7x3x: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (13 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 14/56] staging: comedi: adl_pci6208: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 16/56] staging: comedi: adl_pci8164: " Ian Abbott
                   ` (42 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 618e641..934af3f 100644
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -53,9 +53,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * Register I/O map (32-bit access only)
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 16/56] staging: comedi: adl_pci8164: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (14 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 15/56] staging: comedi: adl_pci7x3x: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 17/56] staging: comedi: adl_pci9111: " Ian Abbott
                   ` (41 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adl_pci8164.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 4a9d63a..da901c8d 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -28,9 +28,8 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #define PCI8164_AXIS(x)		((x) * 0x08)
 #define PCI8164_CMD_MSTS_REG	0x00
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 17/56] staging: comedi: adl_pci9111: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (15 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 16/56] staging: comedi: adl_pci8164: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 18/56] staging: comedi: adl_pci9118: " Ian Abbott
                   ` (40 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adl_pci9111.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index bf563ed..5ca7c6e 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -65,11 +65,10 @@ TODO:
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "plx9052.h"
 #include "comedi_fc.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 18/56] staging: comedi: adl_pci9118: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (16 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 17/56] staging: comedi: adl_pci9111: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 19/56] staging: comedi: adv_pci1710: " Ian Abbott
                   ` (39 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 65b702c..eb4a528 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -73,13 +73,12 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "amcc_s5933.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 19/56] staging: comedi: adv_pci1710: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (17 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 18/56] staging: comedi: adl_pci9118: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 20/56] staging: comedi: adv_pci1723: " Ian Abbott
                   ` (38 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adv_pci1710.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 4a0fb62..f71750b 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -42,10 +42,9 @@ Configuration options:
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 20/56] staging: comedi: adv_pci1723: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (18 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 19/56] staging: comedi: adv_pci1710: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 21/56] staging: comedi: adv_pci1724: " Ian Abbott
                   ` (37 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adv_pci1723.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index f1945be..1921a97 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -41,9 +41,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * PCI Bar 2 I/O Register map (dev->iobase)
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 21/56] staging: comedi: adv_pci1724: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (19 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 20/56] staging: comedi: adv_pci1723: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 22/56] staging: comedi: adv_pci_dio: " Ian Abbott
                   ` (36 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adv_pci1724.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
index a3573ea..f7a7dab 100644
--- a/drivers/staging/comedi/drivers/adv_pci1724.c
+++ b/drivers/staging/comedi/drivers/adv_pci1724.c
@@ -47,9 +47,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * PCI bar 2 Register I/O map (dev->iobase)
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 22/56] staging: comedi: adv_pci_dio: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (20 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 21/56] staging: comedi: adv_pci1724: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 23/56] staging: comedi: amplc_dio200_pci: " Ian Abbott
                   ` (35 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/adv_pci_dio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 11168f9..456e870 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -30,10 +30,9 @@ Configuration options:
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "8255.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 23/56] staging: comedi: amplc_dio200_pci: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (21 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 22/56] staging: comedi: adv_pci_dio: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 24/56] staging: comedi: amplc_pci224: " Ian Abbott
                   ` (34 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/amplc_dio200_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index b83d1f5..d9850c9 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@ -221,10 +221,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "amplc_dio200.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 24/56] staging: comedi: amplc_pci224: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (22 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 23/56] staging: comedi: amplc_dio200_pci: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 25/56] staging: comedi: amplc_pci230: " Ian Abbott
                   ` (33 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/amplc_pci224.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index cf5f646..6c9fa4a 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -103,11 +103,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 25/56] staging: comedi: amplc_pci230: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (23 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 24/56] staging: comedi: amplc_pci224: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 26/56] staging: comedi: amplc_pci236: " Ian Abbott
                   ` (32 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/amplc_pci230.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 2dd794d..a145f39 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -181,11 +181,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 26/56] staging: comedi: amplc_pci236: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (24 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 25/56] staging: comedi: amplc_pci230: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 27/56] staging: comedi: amplc_pci263: " Ian Abbott
                   ` (31 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/amplc_pci236.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pci236.c b/drivers/staging/comedi/drivers/amplc_pci236.c
index ad1e93d..31cc38b 100644
--- a/drivers/staging/comedi/drivers/amplc_pci236.c
+++ b/drivers/staging/comedi/drivers/amplc_pci236.c
@@ -42,10 +42,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "amplc_pc236.h"
 #include "plx9052.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 27/56] staging: comedi: amplc_pci263: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (25 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 26/56] staging: comedi: amplc_pci236: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 28/56] staging: comedi: cb_pcidas64: " Ian Abbott
                   ` (30 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/amplc_pci263.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_pci263.c b/drivers/staging/comedi/drivers/amplc_pci263.c
index 0d2224b..b6768aa 100644
--- a/drivers/staging/comedi/drivers/amplc_pci263.c
+++ b/drivers/staging/comedi/drivers/amplc_pci263.c
@@ -33,9 +33,8 @@ The state of the outputs can be read.
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 static int pci263_do_insn_bits(struct comedi_device *dev,
 			       struct comedi_subdevice *s,
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 28/56] staging: comedi: cb_pcidas64: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (26 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 27/56] staging: comedi: amplc_pci263: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 29/56] staging: comedi: cb_pcidas: " Ian Abbott
                   ` (29 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 2b7c50a..15106d0a 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -81,11 +81,10 @@ TODO:
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "8255.h"
 #include "plx9080.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 29/56] staging: comedi: cb_pcidas: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (27 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 28/56] staging: comedi: cb_pcidas64: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 30/56] staging: comedi: cb_pcidda: " Ian Abbott
                   ` (28 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/cb_pcidas.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 6fdf975..bad04d9 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -62,11 +62,10 @@ analog triggering on 1602 series
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_8254.h"
 #include "8255.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 30/56] staging: comedi: cb_pcidda: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (28 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 29/56] staging: comedi: cb_pcidas: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 31/56] staging: comedi: cb_pcimdas: " Ian Abbott
                   ` (27 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/cb_pcidda.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 2b2cfcd..1e232b1 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -36,9 +36,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "8255.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 31/56] staging: comedi: cb_pcimdas: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (29 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 30/56] staging: comedi: cb_pcidda: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 32/56] staging: comedi: cb_pcimdda: " Ian Abbott
                   ` (26 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/cb_pcimdas.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index acb7740..c458e50 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -42,10 +42,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_8254.h"
 #include "plx9052.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 32/56] staging: comedi: cb_pcimdda: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (30 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 31/56] staging: comedi: cb_pcimdas: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 33/56] staging: comedi: contec_pci_dio: " Ian Abbott
                   ` (25 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index e834be9..a4781db 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -75,9 +75,8 @@ Configuration Options: not applicable, uses PCI auto config
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "8255.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 33/56] staging: comedi: contec_pci_dio: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (31 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 32/56] staging: comedi: cb_pcimdda: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 34/56] staging: comedi: daqboard2000: " Ian Abbott
                   ` (24 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index ba26c13..4956a49 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -26,9 +26,8 @@ Configuration Options: not applicable, uses comedi PCI auto config
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * Register map
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 34/56] staging: comedi: daqboard2000: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (32 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 33/56] staging: comedi: contec_pci_dio: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 35/56] staging: comedi: das08_pci: " Ian Abbott
                   ` (23 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/daqboard2000.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index d625afd..f97d18d 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -103,11 +103,10 @@ Configuration options: not applicable, uses PCI auto config
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "8255.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 35/56] staging: comedi: das08_pci: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (33 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 34/56] staging: comedi: daqboard2000: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 36/56] staging: comedi: dt3000: " Ian Abbott
                   ` (22 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/das08_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c
index b2ea10b..d8d27fa 100644
--- a/drivers/staging/comedi/drivers/das08_pci.c
+++ b/drivers/staging/comedi/drivers/das08_pci.c
@@ -32,9 +32,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "das08.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 36/56] staging: comedi: dt3000: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (34 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 35/56] staging: comedi: das08_pci: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 37/56] staging: comedi: dyna_pci10xx: " Ian Abbott
                   ` (21 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/dt3000.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 0aa5198..1b8ac99 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -49,11 +49,10 @@ AO commands are not supported.
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 37/56] staging: comedi: dyna_pci10xx: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (35 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 36/56] staging: comedi: dt3000: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 38/56] staging: comedi: gsc_hpdi: " Ian Abbott
                   ` (20 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/dyna_pci10xx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index c241d92..c9eb26f 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -34,10 +34,9 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/mutex.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #define READ_TIMEOUT 50
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 38/56] staging: comedi: gsc_hpdi: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (36 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 37/56] staging: comedi: dyna_pci10xx: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 39/56] staging: comedi: icp_multi: " Ian Abbott
                   ` (19 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/gsc_hpdi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index be9988d..8b7c475 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -41,11 +41,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "plx9080.h"
 #include "comedi_fc.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 39/56] staging: comedi: icp_multi: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (37 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 38/56] staging: comedi: gsc_hpdi: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:10 ` [PATCH 40/56] staging: comedi: jr3_pci: " Ian Abbott
                   ` (18 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/icp_multi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index ddcb25d..1e104eb 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -43,11 +43,10 @@ Configuration options: not applicable, uses PCI auto config
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #define ICP_MULTI_ADC_CSR	0	/* R/W: ADC command/status register */
 #define ICP_MULTI_AI		2	/* R:   Analogue input data */
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 40/56] staging: comedi: jr3_pci: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (38 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 39/56] staging: comedi: icp_multi: " Ian Abbott
@ 2015-03-10 16:10 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 41/56] staging: comedi: ke_counter: " Ian Abbott
                   ` (17 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:10 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/jr3_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 81fab2d..a802d99 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -39,14 +39,13 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
 #include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "jr3_pci.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 41/56] staging: comedi: ke_counter: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (39 preceding siblings ...)
  2015-03-10 16:10 ` [PATCH 40/56] staging: comedi: jr3_pci: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 42/56] staging: comedi: me4000: " Ian Abbott
                   ` (16 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ke_counter.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 3c19e0f..dc642ed 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -28,9 +28,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 /*
  * PCI BAR 0 Register I/O map
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 42/56] staging: comedi: me4000: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (40 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 41/56] staging: comedi: ke_counter: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 43/56] staging: comedi: me_daq: " Ian Abbott
                   ` (15 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/me4000.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index ec99254..2502ac6 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -41,11 +41,10 @@ broken.
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "comedi_8254.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 43/56] staging: comedi: me_daq: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (41 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 42/56] staging: comedi: me4000: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 44/56] staging: comedi: mf6x4: " Ian Abbott
                   ` (14 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/me_daq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 92e2352..d78e919 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -30,11 +30,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "plx9052.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 44/56] staging: comedi: mf6x4: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (42 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 43/56] staging: comedi: me_daq: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 45/56] staging: comedi: mite.c: " Ian Abbott
                   ` (13 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/mf6x4.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c
index e9a74ca..a675e2e 100644
--- a/drivers/staging/comedi/drivers/mf6x4.c
+++ b/drivers/staging/comedi/drivers/mf6x4.c
@@ -26,9 +26,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
-#include "../comedidev.h"
+
+#include "../comedi_pci.h"
 
 /* Registers present in BAR0 memory region */
 #define MF624_GPIOC_R					0x54
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 45/56] staging: comedi: mite.c: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (43 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 44/56] staging: comedi: mf6x4: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 46/56] staging: comedi: mite.h: " Ian Abbott
                   ` (12 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/mite.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 79b5597..4cfe949 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -47,9 +47,8 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "mite.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 46/56] staging: comedi: mite.h: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (44 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 45/56] staging: comedi: mite.c: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 47/56] staging: comedi: ni_6527: " Ian Abbott
                   ` (11 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/mite.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h
index b2b1204..b3ca7fc 100644
--- a/drivers/staging/comedi/drivers/mite.h
+++ b/drivers/staging/comedi/drivers/mite.h
@@ -19,10 +19,9 @@
 #ifndef _MITE_H_
 #define _MITE_H_
 
-#include <linux/pci.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #define PCIMIO_COMPAT
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 47/56] staging: comedi: ni_6527: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (45 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 46/56] staging: comedi: mite.h: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 48/56] staging: comedi: ni_65xx: " Ian Abbott
                   ` (10 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_6527.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 530f716..dc87114 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -28,10 +28,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 48/56] staging: comedi: ni_65xx: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (46 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 47/56] staging: comedi: ni_6527: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 49/56] staging: comedi: ni_660x: " Ian Abbott
                   ` (9 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_65xx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 1ff231f..b158bfb 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -57,10 +57,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 49/56] staging: comedi: ni_660x: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (47 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 48/56] staging: comedi: ni_65xx: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 50/56] staging: comedi: ni_670x: " Ian Abbott
                   ` (8 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_660x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 660dc6f..b913158 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -35,10 +35,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "mite.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 50/56] staging: comedi: ni_670x: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (48 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 49/56] staging: comedi: ni_660x: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 51/56] staging: comedi: ni_labpc_pci: " Ian Abbott
                   ` (7 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_670x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 90b4dfa..13c6ccb 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -37,11 +37,10 @@ Commands are not supported.
 */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #define AO_VALUE_OFFSET			0x00
 #define	AO_CHAN_OFFSET			0x0c
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 51/56] staging: comedi: ni_labpc_pci: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (49 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 50/56] staging: comedi: ni_670x: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 52/56] staging: comedi: ni_pcmdio: " Ian Abbott
                   ` (6 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_labpc_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c
index f50a5a2..77d4038 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c
@@ -31,9 +31,8 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "ni_labpc.h"
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 52/56] staging: comedi: ni_pcmdio: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (50 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 51/56] staging: comedi: ni_labpc_pci: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 53/56] staging: comedi: ni_pcmmio: " Ian Abbott
                   ` (5 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of "../comedidev.h",
which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 2852319..9e01f8d 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -53,7 +53,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "mite.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 53/56] staging: comedi: ni_pcmmio: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (51 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 52/56] staging: comedi: ni_pcmdio: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 54/56] staging: comedi: rtd520: " Ian Abbott
                   ` (4 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of "../comedidev.h",
which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_pcimio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 409090d..1481f71a 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -109,7 +109,7 @@ Bugs:
 #include <linux/module.h>
 #include <linux/delay.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include <asm/byteorder.h>
 
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 54/56] staging: comedi: rtd520: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (52 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 53/56] staging: comedi: ni_pcmmio: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 55/56] staging: comedi: s626: " Ian Abbott
                   ` (3 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/rtd520.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index f05b187..d1ecb51 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -94,11 +94,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "plx9080.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 55/56] staging: comedi: s626: include new "comedi_pci.h" header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (53 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 54/56] staging: comedi: rtd520: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:11 ` [PATCH 56/56] staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h Ian Abbott
                   ` (2 subsequent siblings)
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Include the new "../comedi_pci.h" header instead of <linux/pci.h> and
"../comedidev.h", which will now get included indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/drivers/s626.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 3b9ef9a..53a248b 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -61,12 +61,11 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include "../comedidev.h"
+#include "../comedi_pci.h"
 
 #include "comedi_fc.h"
 #include "s626.h"
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* [PATCH 56/56] staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (54 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 55/56] staging: comedi: s626: " Ian Abbott
@ 2015-03-10 16:11 ` Ian Abbott
  2015-03-10 16:25 ` [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Joe Perches
  2015-03-10 20:34 ` Hartley Sweeten
  57 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-10 16:11 UTC (permalink / raw)
  To: driverdev-devel
  Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel

Move the PCI-specific stuff out of "comedidev.h" into "comedi_pci.h".
Comedi PCI drivers now include "comedi_pci.h" instead of "comedidev.h",
which now gets pulled in indirectly.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/comedi_pci.h | 36 ++++++++++++++++++++++++++++++-
 drivers/staging/comedi/comedidev.h  | 43 -------------------------------------
 2 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/drivers/staging/comedi/comedi_pci.h b/drivers/staging/comedi/comedi_pci.h
index a083465..4005cc9 100644
--- a/drivers/staging/comedi/comedi_pci.h
+++ b/drivers/staging/comedi/comedi_pci.h
@@ -24,7 +24,41 @@
 #include "comedidev.h"
 
 /*
- * TODO: Move PCI-specific stuff into here from "comedidev.h".
+ * PCI Vendor IDs not in <linux/pci_ids.h>
  */
+#define PCI_VENDOR_ID_KOLTER		0x1001
+#define PCI_VENDOR_ID_ICP		0x104c
+#define PCI_VENDOR_ID_DT		0x1116
+#define PCI_VENDOR_ID_IOTECH		0x1616
+#define PCI_VENDOR_ID_CONTEC		0x1221
+#define PCI_VENDOR_ID_RTD		0x1435
+#define PCI_VENDOR_ID_HUMUSOFT		0x186c
+
+struct pci_dev *comedi_to_pci_dev(struct comedi_device *);
+
+int comedi_pci_enable(struct comedi_device *);
+void comedi_pci_disable(struct comedi_device *);
+void comedi_pci_detach(struct comedi_device *);
+
+int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,
+			   unsigned long context);
+void comedi_pci_auto_unconfig(struct pci_dev *);
+
+int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);
+void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);
+
+/**
+ * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver
+ * @__comedi_driver: comedi_driver struct
+ * @__pci_driver: pci_driver struct
+ *
+ * Helper macro for comedi PCI drivers which do not do anything special
+ * in module init/exit. This eliminates a lot of boilerplate. Each
+ * module may only use this macro once, and calling it replaces
+ * module_init() and module_exit()
+ */
+#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \
+	module_driver(__comedi_driver, comedi_pci_driver_register, \
+			comedi_pci_driver_unregister, &(__pci_driver))
 
 #endif /* _COMEDI_PCI_H */
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 30595c0..4720dbc 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -554,47 +554,4 @@ void comedi_driver_unregister(struct comedi_driver *);
 	module_driver(__comedi_driver, comedi_driver_register, \
 			comedi_driver_unregister)
 
-/* comedi_pci.c - comedi PCI driver specific functions */
-
-/*
- * PCI Vendor IDs not in <linux/pci_ids.h>
- */
-#define PCI_VENDOR_ID_KOLTER		0x1001
-#define PCI_VENDOR_ID_ICP		0x104c
-#define PCI_VENDOR_ID_DT		0x1116
-#define PCI_VENDOR_ID_IOTECH		0x1616
-#define PCI_VENDOR_ID_CONTEC		0x1221
-#define PCI_VENDOR_ID_RTD		0x1435
-#define PCI_VENDOR_ID_HUMUSOFT		0x186c
-
-struct pci_dev;
-struct pci_driver;
-
-struct pci_dev *comedi_to_pci_dev(struct comedi_device *);
-
-int comedi_pci_enable(struct comedi_device *);
-void comedi_pci_disable(struct comedi_device *);
-void comedi_pci_detach(struct comedi_device *);
-
-int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,
-			   unsigned long context);
-void comedi_pci_auto_unconfig(struct pci_dev *);
-
-int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);
-void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);
-
-/**
- * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver
- * @__comedi_driver: comedi_driver struct
- * @__pci_driver: pci_driver struct
- *
- * Helper macro for comedi PCI drivers which do not do anything special
- * in module init/exit. This eliminates a lot of boilerplate. Each
- * module may only use this macro once, and calling it replaces
- * module_init() and module_exit()
- */
-#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \
-	module_driver(__comedi_driver, comedi_pci_driver_register, \
-			comedi_pci_driver_unregister, &(__pci_driver))
-
 #endif /* _COMEDIDEV_H */
-- 
2.1.4


^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (55 preceding siblings ...)
  2015-03-10 16:11 ` [PATCH 56/56] staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h Ian Abbott
@ 2015-03-10 16:25 ` Joe Perches
  2015-03-10 18:26   ` Hartley Sweeten
  2015-03-12 10:29   ` Ian Abbott
  2015-03-10 20:34 ` Hartley Sweeten
  57 siblings, 2 replies; 64+ messages in thread
From: Joe Perches @ 2015-03-10 16:25 UTC (permalink / raw)
  To: Ian Abbott
  Cc: driverdev-devel, Greg Kroah-Hartman, H Hartley Sweeten, linux-kernel

On Tue, 2015-03-10 at 16:10 +0000, Ian Abbott wrote:
> "comedidev.h" includes PCI-specific stuff that gets included by all
> comedi drivers including non-PCI ones.  Separate it out into its own
> header "comedi_pci.h".  Make the new header include <linux/pci.h> and
> "comedidev.h" so that comedi PCI drivers do not need to include them
> explicitly.

Isn't the kernel progressing to avoid indirect includes?

Perhaps it'd be nicer to move generic comedi .h files into
a more common location and change the include path so that
the include statements don't have to be relative?

Maybe add an include/comedi/ directory?



^ permalink raw reply	[flat|nested] 64+ messages in thread

* RE: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 16:25 ` [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Joe Perches
@ 2015-03-10 18:26   ` Hartley Sweeten
  2015-03-10 18:35     ` Joe Perches
  2015-03-12 10:29   ` Ian Abbott
  1 sibling, 1 reply; 64+ messages in thread
From: Hartley Sweeten @ 2015-03-10 18:26 UTC (permalink / raw)
  To: Joe Perches, Ian Abbott; +Cc: driverdev-devel, Greg Kroah-Hartman, linux-kernel

On Tuesday, March 10, 2015 9:25 AM, Joe Perches wrote:
> On Tue, 2015-03-10 at 16:10 +0000, Ian Abbott wrote:
>> "comedidev.h" includes PCI-specific stuff that gets included by all
>> comedi drivers including non-PCI ones.  Separate it out into its own
>> header "comedi_pci.h".  Make the new header include <linux/pci.h> and
>> "comedidev.h" so that comedi PCI drivers do not need to include them
>> explicitly.
>
> Isn't the kernel progressing to avoid indirect includes?

It appears so, and in general I agree. But, I also agree with what Ian has
done here.

> Perhaps it'd be nicer to move generic comedi .h files into
> a more common location and change the include path so that
> the include statements don't have to be relative?
>
> Maybe add an include/comedi/ directory?

Ian already submitted similar patches for the comedi USB and PCMCIA
drivers. Those patches have been applied.

The comedi PCI/PCMCIA/USB (i.e. "bus") drivers now just need to include
the "bus"  specific comedi driver header to get the bus specific interface
functions. These functions include the:

module_comedi_"bus"_driver		
	helper macro for the module_init/module_exit boilerplate
comedi_"bus"_driver_register()	
comedi_"bus"_driver_unregister()	
	helper functions to register and unregister the "bus" and comedi drivers
comedi_"bus"_auto_config()
comedi_"bus"_auto_unconfig()
	helper functions for the "bus" driver to probe/remove the comedi driver
comedi_"bus"_enable()
comedi_"bus"_disable()
	helper functions to request and enable/disable and release the I/O
comedi_to_"bus"_dev()
	helper function to get the "bus" device from the comedi device

These comedi_"bus" headers keep the drivers clean and easy to maintain.
The drivers are still responsible for including any headers that are not specifically
needed for the "bus".

When comedi gets moved out of staging we will need to decide where the
headers go. The only one I know for sure is comedi.h. That one is the UAPI
header (include/uapi/comedi.h). The rest in drivers/staging/comedi will need
to either go into include/linux/*.h or include/linux/comedi/*.h.

There are still a couple headers in the comedi/drivers directory. Those do not
need to be exposed so I think the relative include is fine.

Just my two cents....

Regards,
Hartley


^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 18:26   ` Hartley Sweeten
@ 2015-03-10 18:35     ` Joe Perches
  2015-03-10 18:38       ` Greg Kroah-Hartman
  0 siblings, 1 reply; 64+ messages in thread
From: Joe Perches @ 2015-03-10 18:35 UTC (permalink / raw)
  To: Hartley Sweeten
  Cc: Ian Abbott, driverdev-devel, Greg Kroah-Hartman, linux-kernel

On Tue, 2015-03-10 at 18:26 +0000, Hartley Sweeten wrote:
> When comedi gets moved out of staging we will need to decide where the
> headers go.

Any idea when that might happen?




^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 18:35     ` Joe Perches
@ 2015-03-10 18:38       ` Greg Kroah-Hartman
  0 siblings, 0 replies; 64+ messages in thread
From: Greg Kroah-Hartman @ 2015-03-10 18:38 UTC (permalink / raw)
  To: Joe Perches; +Cc: Hartley Sweeten, Ian Abbott, driverdev-devel, linux-kernel

On Tue, Mar 10, 2015 at 11:35:25AM -0700, Joe Perches wrote:
> On Tue, 2015-03-10 at 18:26 +0000, Hartley Sweeten wrote:
> > When comedi gets moved out of staging we will need to decide where the
> > headers go.
> 
> Any idea when that might happen?
> 
> 

"when it is ready."



^ permalink raw reply	[flat|nested] 64+ messages in thread

* RE: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
                   ` (56 preceding siblings ...)
  2015-03-10 16:25 ` [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Joe Perches
@ 2015-03-10 20:34 ` Hartley Sweeten
  57 siblings, 0 replies; 64+ messages in thread
From: Hartley Sweeten @ 2015-03-10 20:34 UTC (permalink / raw)
  To: Ian Abbott, driverdev-devel; +Cc: Greg Kroah-Hartman, linux-kernel

On Tuesday, March 10, 2015 9:10 AM, Ian Abbott wrote:
> "comedidev.h" includes PCI-specific stuff that gets included by all
> comedi drivers including non-PCI ones.  Separate it out into its own
> header "comedi_pci.h".  Make the new header include <linux/pci.h> and
> "comedidev.h" so that comedi PCI drivers do not need to include them
> explicitly.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>


^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-10 16:25 ` [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Joe Perches
  2015-03-10 18:26   ` Hartley Sweeten
@ 2015-03-12 10:29   ` Ian Abbott
  2015-03-13 10:28     ` Ian Abbott
  1 sibling, 1 reply; 64+ messages in thread
From: Ian Abbott @ 2015-03-12 10:29 UTC (permalink / raw)
  To: Joe Perches
  Cc: driverdev-devel, Greg Kroah-Hartman, H Hartley Sweeten, linux-kernel

On 10/03/15 16:25, Joe Perches wrote:
> On Tue, 2015-03-10 at 16:10 +0000, Ian Abbott wrote:
>> "comedidev.h" includes PCI-specific stuff that gets included by all
>> comedi drivers including non-PCI ones.  Separate it out into its own
>> header "comedi_pci.h".  Make the new header include <linux/pci.h> and
>> "comedidev.h" so that comedi PCI drivers do not need to include them
>> explicitly.
>
> Isn't the kernel progressing to avoid indirect includes?

I could do it that way if you think it would help.  Better to redo it 
before it is committed than after.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
  2015-03-12 10:29   ` Ian Abbott
@ 2015-03-13 10:28     ` Ian Abbott
  0 siblings, 0 replies; 64+ messages in thread
From: Ian Abbott @ 2015-03-13 10:28 UTC (permalink / raw)
  To: Joe Perches
  Cc: driverdev-devel, Greg Kroah-Hartman, H Hartley Sweeten, linux-kernel

On 12/03/15 10:29, Ian Abbott wrote:
> On 10/03/15 16:25, Joe Perches wrote:
>> On Tue, 2015-03-10 at 16:10 +0000, Ian Abbott wrote:
>>> "comedidev.h" includes PCI-specific stuff that gets included by all
>>> comedi drivers including non-PCI ones.  Separate it out into its own
>>> header "comedi_pci.h".  Make the new header include <linux/pci.h> and
>>> "comedidev.h" so that comedi PCI drivers do not need to include them
>>> explicitly.
>>
>> Isn't the kernel progressing to avoid indirect includes?
>
> I could do it that way if you think it would help.  Better to redo it
> before it is committed than after.

I have a v2 series ready to post now, that doesn't use the indirect 
includes.  Should I post that one, Greg, or are you okay with the 
existing series?

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 64+ messages in thread

end of thread, other threads:[~2015-03-13 10:28 UTC | newest]

Thread overview: 64+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-10 16:10 [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Ian Abbott
2015-03-10 16:10 ` [PATCH 01/56] staging: comedi: add comedi_pci.h Ian Abbott
2015-03-10 16:10 ` [PATCH 02/56] staging: comedi: comedi_pci.c: include new "comedi_pci.h" header Ian Abbott
2015-03-10 16:10 ` [PATCH 03/56] staging: comedi: 8255_pci: " Ian Abbott
2015-03-10 16:10 ` [PATCH 04/56] staging: comedi: addi_apci_1032: " Ian Abbott
2015-03-10 16:10 ` [PATCH 05/56] staging: comedi: addi_apci_1500: " Ian Abbott
2015-03-10 16:10 ` [PATCH 06/56] staging: comedi: addi_apci_1516: " Ian Abbott
2015-03-10 16:10 ` [PATCH 07/56] staging: comedi: addi_apci_1564: " Ian Abbott
2015-03-10 16:10 ` [PATCH 08/56] staging: comedi: addi_apci_16xx: " Ian Abbott
2015-03-10 16:10 ` [PATCH 09/56] staging: comedi: addi_apci_2032: " Ian Abbott
2015-03-10 16:10 ` [PATCH 10/56] staging: comedi: addi_apci_2200: " Ian Abbott
2015-03-10 16:10 ` [PATCH 11/56] staging: comedi: addi_apci_3120: " Ian Abbott
2015-03-10 16:10 ` [PATCH 12/56] staging: comedi: addi_apci_3501: " Ian Abbott
2015-03-10 16:10 ` [PATCH 13/56] staging: comedi: addi_apci_3xxx: " Ian Abbott
2015-03-10 16:10 ` [PATCH 14/56] staging: comedi: adl_pci6208: " Ian Abbott
2015-03-10 16:10 ` [PATCH 15/56] staging: comedi: adl_pci7x3x: " Ian Abbott
2015-03-10 16:10 ` [PATCH 16/56] staging: comedi: adl_pci8164: " Ian Abbott
2015-03-10 16:10 ` [PATCH 17/56] staging: comedi: adl_pci9111: " Ian Abbott
2015-03-10 16:10 ` [PATCH 18/56] staging: comedi: adl_pci9118: " Ian Abbott
2015-03-10 16:10 ` [PATCH 19/56] staging: comedi: adv_pci1710: " Ian Abbott
2015-03-10 16:10 ` [PATCH 20/56] staging: comedi: adv_pci1723: " Ian Abbott
2015-03-10 16:10 ` [PATCH 21/56] staging: comedi: adv_pci1724: " Ian Abbott
2015-03-10 16:10 ` [PATCH 22/56] staging: comedi: adv_pci_dio: " Ian Abbott
2015-03-10 16:10 ` [PATCH 23/56] staging: comedi: amplc_dio200_pci: " Ian Abbott
2015-03-10 16:10 ` [PATCH 24/56] staging: comedi: amplc_pci224: " Ian Abbott
2015-03-10 16:10 ` [PATCH 25/56] staging: comedi: amplc_pci230: " Ian Abbott
2015-03-10 16:10 ` [PATCH 26/56] staging: comedi: amplc_pci236: " Ian Abbott
2015-03-10 16:10 ` [PATCH 27/56] staging: comedi: amplc_pci263: " Ian Abbott
2015-03-10 16:10 ` [PATCH 28/56] staging: comedi: cb_pcidas64: " Ian Abbott
2015-03-10 16:10 ` [PATCH 29/56] staging: comedi: cb_pcidas: " Ian Abbott
2015-03-10 16:10 ` [PATCH 30/56] staging: comedi: cb_pcidda: " Ian Abbott
2015-03-10 16:10 ` [PATCH 31/56] staging: comedi: cb_pcimdas: " Ian Abbott
2015-03-10 16:10 ` [PATCH 32/56] staging: comedi: cb_pcimdda: " Ian Abbott
2015-03-10 16:10 ` [PATCH 33/56] staging: comedi: contec_pci_dio: " Ian Abbott
2015-03-10 16:10 ` [PATCH 34/56] staging: comedi: daqboard2000: " Ian Abbott
2015-03-10 16:10 ` [PATCH 35/56] staging: comedi: das08_pci: " Ian Abbott
2015-03-10 16:10 ` [PATCH 36/56] staging: comedi: dt3000: " Ian Abbott
2015-03-10 16:10 ` [PATCH 37/56] staging: comedi: dyna_pci10xx: " Ian Abbott
2015-03-10 16:10 ` [PATCH 38/56] staging: comedi: gsc_hpdi: " Ian Abbott
2015-03-10 16:10 ` [PATCH 39/56] staging: comedi: icp_multi: " Ian Abbott
2015-03-10 16:10 ` [PATCH 40/56] staging: comedi: jr3_pci: " Ian Abbott
2015-03-10 16:11 ` [PATCH 41/56] staging: comedi: ke_counter: " Ian Abbott
2015-03-10 16:11 ` [PATCH 42/56] staging: comedi: me4000: " Ian Abbott
2015-03-10 16:11 ` [PATCH 43/56] staging: comedi: me_daq: " Ian Abbott
2015-03-10 16:11 ` [PATCH 44/56] staging: comedi: mf6x4: " Ian Abbott
2015-03-10 16:11 ` [PATCH 45/56] staging: comedi: mite.c: " Ian Abbott
2015-03-10 16:11 ` [PATCH 46/56] staging: comedi: mite.h: " Ian Abbott
2015-03-10 16:11 ` [PATCH 47/56] staging: comedi: ni_6527: " Ian Abbott
2015-03-10 16:11 ` [PATCH 48/56] staging: comedi: ni_65xx: " Ian Abbott
2015-03-10 16:11 ` [PATCH 49/56] staging: comedi: ni_660x: " Ian Abbott
2015-03-10 16:11 ` [PATCH 50/56] staging: comedi: ni_670x: " Ian Abbott
2015-03-10 16:11 ` [PATCH 51/56] staging: comedi: ni_labpc_pci: " Ian Abbott
2015-03-10 16:11 ` [PATCH 52/56] staging: comedi: ni_pcmdio: " Ian Abbott
2015-03-10 16:11 ` [PATCH 53/56] staging: comedi: ni_pcmmio: " Ian Abbott
2015-03-10 16:11 ` [PATCH 54/56] staging: comedi: rtd520: " Ian Abbott
2015-03-10 16:11 ` [PATCH 55/56] staging: comedi: s626: " Ian Abbott
2015-03-10 16:11 ` [PATCH 56/56] staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h Ian Abbott
2015-03-10 16:25 ` [PATCH 00/56] staging: comedi: introduce comedi_pci.h header Joe Perches
2015-03-10 18:26   ` Hartley Sweeten
2015-03-10 18:35     ` Joe Perches
2015-03-10 18:38       ` Greg Kroah-Hartman
2015-03-12 10:29   ` Ian Abbott
2015-03-13 10:28     ` Ian Abbott
2015-03-10 20:34 ` Hartley Sweeten

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).