[PATCH 26/33] staging: comedi: adv_pci_dio: rename PCI1752_6_CFC define

H Hartley Sweeten hsweeten at visionengravers.com
Wed Nov 18 17:07:27 UTC 2015


For aesthetics, rename this define and fix the alignment.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/adv_pci_dio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index f7466f4..5aba40e 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -67,7 +67,8 @@ enum hw_cards_id {
 /* PCI-1754, PCI-1756 interrupt control registers */
 #define PCI1754_INT_REG(x)	(0x08 + (x) * 2) /* R/W: control group 0 to 3 */
 
-#define PCI1752_6_CFC	0x12	/* R/W: set/read channel freeze function */
+/* PCI-1752, PCI-1756 special registers */
+#define PCI1752_CFC_REG		0x12	/* R/W: channel freeze function */
 
 /*  Advantech PCI-1762 registers */
 #define PCI1762_ICR	   6	/* W:   Interrupt control register */
@@ -286,7 +287,7 @@ static int pci_dio_reset(struct comedi_device *dev)
 
 	/* disable channel freeze function on the PCI-1752/1756 boards */
 	if (board->cardtype == TYPE_PCI1752 || board->cardtype == TYPE_PCI1756)
-		outw(0, dev->iobase + PCI1752_6_CFC);
+		outw(0, dev->iobase + PCI1752_CFC_REG);
 
 	/* disable and clear interrupts */
 	switch (board->cardtype) {
-- 
2.5.1



More information about the devel mailing list