leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: pcl818: remove 'io_range' from boardinfo

Browse Source 
The 'io_range' is the same for all board types. Remove this data from
the boardinfo.

The i/o resource size is larger for board types that have a FIFO but this
larger region is only requested if the user wants to use the fifo.

Modify the pcl818_attach() to remove the need for the 'io_range' in the
private data.

For aesthetics, rename the 'fifo' member in the boardinfo to 'has_fifo'
and change it to a bit-field.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-17 14:26:42 -07:00 committed by Greg Kroah-Hartman
parent 2599048aeb
commit d612558839
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/pcl818.c
View File

@ -121,11 +121,6 @@ A word or two about DMA. Driver support DMA operations at two ways:
#define boardPCL818 4
#define boardPCL718 5
/* IO space len */
#define PCLx1x_RANGE 16
/* IO space len if we use FIFO */
#define PCLx1xFIFO_RANGE 32
/* W: clear INT request */
#define PCL818_CLRINT 8
/* R: return status byte */
@ -272,12 +267,11 @@ struct pcl818_board {
int n_dochan;
const struct comedi_lrange *ai_range_type;
const struct comedi_lrange *ao_range_type;
unsigned int io_range;
unsigned int IRQbits;
unsigned int DMAbits;
int ai_maxdata;
int ao_maxdata;
unsigned char fifo;
unsigned int has_fifo:1;
int is_818;
};
@ -293,7 +287,6 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818l_l_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
@ -310,7 +303,6 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818h_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
@ -327,12 +319,11 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818h_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
.ao_maxdata = 0xfff,
.fifo = 1,
.has_fifo = 1,
.is_818 = 1,
}, {
.name = "pcl818hg",
@ -345,12 +336,11 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818hg_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
.ao_maxdata = 0xfff,
.fifo = 1,
.has_fifo = 1,
.is_818 = 1,
}, {
.name = "pcl818",
@ -363,7 +353,6 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818h_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
@ -380,7 +369,6 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_unipolar5,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
@ -395,7 +383,6 @@ static const struct pcl818_board boardtypes[] = {
.n_dochan = 16,
.ai_range_type = &range_pcl818h_ai,
.ao_range_type = &range_unipolar5,
.io_range = PCLx1x_RANGE,
.IRQbits = 0x00fc,
.DMAbits = 0x0a,
.ai_maxdata = 0xfff,
@ -407,7 +394,6 @@ static const struct pcl818_board boardtypes[] = {
struct pcl818_private {
unsigned int dma; /* used DMA, 0=don't use DMA */
unsigned int io_range;
unsigned long dmabuf[2]; /* pointers to begin of DMA buffers */
unsigned int dmapages[2]; /* len of DMA buffers in PAGE_SIZEs */
unsigned int hwdmaptr[2]; /* hardware address of DMA buffers */
@ -1345,13 +1331,12 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devpriv)
return -ENOMEM;
devpriv->io_range = board->io_range;
if ((board->fifo) && (it->options[2] == -1)) {
/* we've board with FIFO and we want to use FIFO */
devpriv->io_range = PCLx1xFIFO_RANGE;
/* should we use the FIFO? */
if (board->has_fifo && it->options[2] == -1)
devpriv->usefifo = 1;
}
ret = comedi_request_region(dev, it->options[0], devpriv->io_range);
ret = comedi_request_region(dev, it->options[0],
devpriv->usefifo ? 0x20 : 0x10);
if (ret)
return ret;