Rename the boardinfo 'memory_mapped_io' to 'has_mmio'.
Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/ni_labpc.c | 6 +++---
drivers/staging/comedi/drivers/ni_labpc.h | 2 +-
drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c
b/drivers/staging/comedi/drivers/ni_labpc.c
index e2bea6b..3173557 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -736,7 +736,7 @@ static inline int labpc_counter_load(struct comedi_device
*dev,
{
const struct labpc_boardinfo *thisboard = comedi_board(dev);
- if (thisboard->memory_mapped_io)
+ if (thisboard->has_mmio)
return i8254_mm_load((void __iomem *)base_address, 0,
counter_number, count, mode);
else
@@ -1570,7 +1570,7 @@ int labpc_common_attach(struct comedi_device *dev,
int i;
int ret;
- if (thisboard->memory_mapped_io) {
+ if (thisboard->has_mmio) {
devpriv->read_byte = labpc_readb;
devpriv->write_byte = labpc_writeb;
} else {
@@ -1651,7 +1651,7 @@ int labpc_common_attach(struct comedi_device *dev,
/* 8255 dio */
s = &dev->subdevices[subdev++];
- if (thisboard->memory_mapped_io)
+ if (thisboard->has_mmio)
subdev_8255_init(dev, s, labpc_dio_mem_callback,
(unsigned long)(dev->iobase + DIO_BASE_REG));
else
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h
b/drivers/staging/comedi/drivers/ni_labpc.h
index 627159f..89db708 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -48,7 +48,7 @@ struct labpc_boardinfo {
unsigned ai_scan_up:1;
/* uses memory mapped io instead of ioports */
- unsigned memory_mapped_io:1;
+ unsigned has_mmio:1;
};
struct labpc_private {
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c
b/drivers/staging/comedi/drivers/ni_labpc_pci.c
index 31f2edc..784ebfb 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c
@@ -53,7 +53,7 @@ static const struct labpc_boardinfo labpc_pci_boards[] = {
.ai_range_code = labpc_1200_ai_gain_bits,
.ai_range_is_unipolar = labpc_1200_is_unipolar,
.ai_scan_up = 1,
- .memory_mapped_io = 1,
+ .has_mmio = 1,
},
};
--
1.8.1.4
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
