diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 14:59:41 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:14 +0200 |
| commit | 63b2bb05e1ac74c309d61d6c0763c5fb75cc8791 (patch) | |
| tree | e6867677277a5b9cf7c9b38479814a764bfb804b | |
| parent | staging: comedi: ni_stc.h: tidy up AI_Status_2_Register (diff) | |
staging: comedi: ni_stc.h: tidy up AO_Status_2_Register
Rename the CamelCase.
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/ni_mio_common.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 7b579376f3ba..6b7013831ef7 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -414,7 +414,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = { [NISTC_AO_STATUS1_REG] = { 0x106, 2 }, [NISTC_G01_STATUS_REG] = { 0x108, 2 }, [NISTC_AI_STATUS2_REG] = { 0, 0 }, /* Unknown */ - [AO_Status_2_Register] = { 0x10c, 2 }, + [NISTC_AO_STATUS2_REG] = { 0x10c, 2 }, [DIO_Parallel_Input_Register] = { 0, 0 }, /* Unknown */ [G_HW_Save_Register(0)] = { 0x110, 4 }, [G_HW_Save_Register(1)] = { 0x114, 4 }, @@ -1475,7 +1475,7 @@ static void handle_b_interrupt(struct comedi_device *dev, if (b_status & NISTC_AO_STATUS1_OVERRUN) { dev_err(dev->class_dev, "AO FIFO underrun status=0x%04x status2=0x%04x\n", - b_status, ni_stc_readw(dev, AO_Status_2_Register)); + b_status, ni_stc_readw(dev, NISTC_AO_STATUS2_REG)); s->async->events |= COMEDI_CB_OVERFLOW; } diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 2f72c47ef2f6..4411f7baeeee 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -536,7 +536,7 @@ #define NISTC_AI_STATUS2_REG 5 -#define AO_Status_2_Register 6 +#define NISTC_AO_STATUS2_REG 6 #define DIO_Parallel_Input_Register 7 |