aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-08 21:21:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-09 19:29:26 -0400
commitca52a233f7e0ba12ceab6a99fea60e877207e58f (patch)
treed118057e147ef487edfae88af3e5e979b4a8f25d /drivers/staging
parent0181ae77e383ca86bc5182f816c09de2bc38c2d2 (diff)
staging: comedi: rti800: remove am9513.h header
This driver is the only file that includes the am9513.h header and nothing from that header is actually used. Using the macros provided by am9513.h is a bit ugly due to having to predefine a number of additional macros to handle the low-level I/O to the Am9513 device. Just remove the header and the unused I/O helpers in the rti800 driver. If support for the am9513 is added later it wil be implemented properly at that time. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/am9513.h79
-rw-r--r--drivers/staging/comedi/drivers/rti800.c9
2 files changed, 0 insertions, 88 deletions
diff --git a/drivers/staging/comedi/drivers/am9513.h b/drivers/staging/comedi/drivers/am9513.h
deleted file mode 100644
index 0bb839e51493..000000000000
--- a/drivers/staging/comedi/drivers/am9513.h
+++ /dev/null
@@ -1,79 +0,0 @@
1/*
2 module/am9513.h
3 value added preprocessor definitions for Am9513 timer chip
4
5 COMEDI - Linux Control and Measurement Device Interface
6 Copyright (C) 1998 David A. Schleef <ds@schleef.org>
7
8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version.
12
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
17
18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21
22*/
23
24#ifndef _AM9513_H_
25#define _AM9513_H_
26
27#if 0
28
29/*
30 * Before including this file, the following need to be defined:
31 */
32#define Am9513_8BITBUS xxx
33/* or */
34#define Am9513_16BITBUS xxx
35
36#define Am9513_output_control(a) xxx
37#define Am9513_input_status() xxx
38#define Am9513_output_data(a) xxx
39#define Am9513_input_data() xxx
40
41#endif
42
43/*
44 *
45 */
46
47#ifdef Am9513_8BITBUS
48
49#define Am9513_write_register(reg, val) \
50 do { \
51 Am9513_output_control(reg); \
52 Am9513_output_data(val>>8); \
53 Am9513_output_data(val&0xff); \
54 } while (0)
55
56#define Am9513_read_register(reg, val) \
57 do { \
58 Am9513_output_control(reg); \
59 val = Am9513_input_data()<<8; \
60 val |= Am9513_input_data(); \
61 } while (0)
62
63#else /* Am9513_16BITBUS */
64
65#define Am9513_write_register(reg, val) \
66 do { \
67 Am9513_output_control(reg); \
68 Am9513_output_data(val); \
69 } while (0)
70
71#define Am9513_read_register(reg, val) \
72 do { \
73 Am9513_output_control(reg); \
74 val = Am9513_input_data(); \
75 } while (0)
76
77#endif
78
79#endif
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index bab8b31a731d..cb9c72cc9e4b 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -90,15 +90,6 @@ Configuration options:
90 90
91#define RTI800_AI_TIMEOUT 100 91#define RTI800_AI_TIMEOUT 100
92 92
93#define Am9513_8BITBUS
94
95#define Am9513_output_control(a) outb(a, dev->iobase+RTI800_9513A_CNTRL)
96#define Am9513_output_data(a) outb(a, dev->iobase+RTI800_9513A_DATA)
97#define Am9513_input_data() inb(dev->iobase+RTI800_9513A_DATA)
98#define Am9513_input_status() inb(dev->iobase+RTI800_9513A_STATUS)
99
100#include "am9513.h"
101
102static const struct comedi_lrange range_rti800_ai_10_bipolar = { 93static const struct comedi_lrange range_rti800_ai_10_bipolar = {
103 4, { 94 4, {
104 BIP_RANGE(10), 95 BIP_RANGE(10),