diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-08-02 00:07:01 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 23:23:10 +0400 |
| commit | cf200de92ffd97ee46f6affeb8240448319af8ae (patch) | |
| tree | a52055444d0478fc43f590068102048c2ebeee93 | |
| parent | 7560e527534570199382ac72278301e9ac82920e (diff) | |
| download | linux-cf200de92ffd97ee46f6affeb8240448319af8ae.tar.xz | |
staging: comedi: amplc_dio200: remove 'mainsize' from ISA boardinfo
All the ISA DIO200 boards have an i/o region size of 0x20 (DIO200_IO_SIZE).
Remove the boardinfo and open code the size in the comedi_request_region()
call.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index f0adead92ba7..6f35c83e4789 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c @@ -203,7 +203,6 @@ static const struct dio200_board dio200_isa_boards[] = { { .name = "pc212e", - .mainsize = DIO200_IO_SIZE, .layout = { .n_subdevs = 6, .sdtype = {sd_8255, sd_8254, sd_8254, sd_8254, sd_8254, @@ -215,7 +214,6 @@ static const struct dio200_board dio200_isa_boards[] = { }, { .name = "pc214e", - .mainsize = DIO200_IO_SIZE, .layout = { .n_subdevs = 4, .sdtype = {sd_8255, sd_8255, sd_8254, sd_intr}, @@ -224,7 +222,6 @@ static const struct dio200_board dio200_isa_boards[] = { }, { .name = "pc215e", - .mainsize = DIO200_IO_SIZE, .layout = { .n_subdevs = 5, .sdtype = {sd_8255, sd_8255, sd_8254, sd_8254, sd_intr}, @@ -235,7 +232,6 @@ static const struct dio200_board dio200_isa_boards[] = { }, { .name = "pc218e", - .mainsize = DIO200_IO_SIZE, .layout = { .n_subdevs = 7, .sdtype = {sd_8254, sd_8254, sd_8255, sd_8254, sd_8254, @@ -247,7 +243,6 @@ static const struct dio200_board dio200_isa_boards[] = { }, { .name = "pc272e", - .mainsize = DIO200_IO_SIZE, .layout = { .n_subdevs = 4, .sdtype = {sd_8255, sd_8255, sd_8255, sd_intr}, @@ -259,13 +254,12 @@ static const struct dio200_board dio200_isa_boards[] = { static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct dio200_board *thisboard = comedi_board(dev); unsigned int irq; int ret; irq = it->options[1]; - ret = comedi_request_region(dev, it->options[0], thisboard->mainsize); + ret = comedi_request_region(dev, it->options[0], 0x20); if (ret) return ret; |