From: H Hartley Sweeten Date: Tue, 9 Apr 2013 01:21:42 +0000 (-0700) Subject: staging: comedi: rti800: remove am9513.h header X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca52a233f7e0ba12ceab6a99fea60e877207e58f;p=linux-beck.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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 @@ -/* - module/am9513.h - value added preprocessor definitions for Am9513 timer chip - - COMEDI - Linux Control and Measurement Device Interface - Copyright (C) 1998 David A. Schleef - - 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. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef _AM9513_H_ -#define _AM9513_H_ - -#if 0 - -/* - * Before including this file, the following need to be defined: - */ -#define Am9513_8BITBUS xxx -/* or */ -#define Am9513_16BITBUS xxx - -#define Am9513_output_control(a) xxx -#define Am9513_input_status() xxx -#define Am9513_output_data(a) xxx -#define Am9513_input_data() xxx - -#endif - -/* - * - */ - -#ifdef Am9513_8BITBUS - -#define Am9513_write_register(reg, val) \ - do { \ - Am9513_output_control(reg); \ - Am9513_output_data(val>>8); \ - Am9513_output_data(val&0xff); \ - } while (0) - -#define Am9513_read_register(reg, val) \ - do { \ - Am9513_output_control(reg); \ - val = Am9513_input_data()<<8; \ - val |= Am9513_input_data(); \ - } while (0) - -#else /* Am9513_16BITBUS */ - -#define Am9513_write_register(reg, val) \ - do { \ - Am9513_output_control(reg); \ - Am9513_output_data(val); \ - } while (0) - -#define Am9513_read_register(reg, val) \ - do { \ - Am9513_output_control(reg); \ - val = Am9513_input_data(); \ - } while (0) - -#endif - -#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: #define RTI800_AI_TIMEOUT 100 -#define Am9513_8BITBUS - -#define Am9513_output_control(a) outb(a, dev->iobase+RTI800_9513A_CNTRL) -#define Am9513_output_data(a) outb(a, dev->iobase+RTI800_9513A_DATA) -#define Am9513_input_data() inb(dev->iobase+RTI800_9513A_DATA) -#define Am9513_input_status() inb(dev->iobase+RTI800_9513A_STATUS) - -#include "am9513.h" - static const struct comedi_lrange range_rti800_ai_10_bipolar = { 4, { BIP_RANGE(10),