Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945AbbFERbI (ORCPT ); Fri, 5 Jun 2015 13:31:08 -0400 Received: from smtp81.iad3a.emailsrvr.com ([173.203.187.81]:37148 "EHLO smtp81.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932903AbbFERbB (ORCPT ); Fri, 5 Jun 2015 13:31:01 -0400 X-Sender-Id: abbotti@mev.co.uk From: Ian Abbott To: Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , Subject: [PATCH 12/32] staging: comedi: das08: rename and rewrite DAS08_IP Date: Fri, 5 Jun 2015 18:30:15 +0100 Message-Id: <1433525435-12986-13-git-send-email-abbotti@mev.co.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433525435-12986-1-git-send-email-abbotti@mev.co.uk> References: <1433525435-12986-1-git-send-email-abbotti@mev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1652 Lines: 42 The `DAS08_IP()` macro takes a value read from the status register and returns the state of the three digital input channels (except on "JR" boards). Rename it to `DAS08_STATUS_DI()` and add a comment. Also re-arrange the expression used to extract the state of the digital inputs for consistency with other register macros. Signed-off-by: Ian Abbott --- drivers/staging/comedi/drivers/das08.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 935bbfb..eef0456 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -65,7 +65,8 @@ * setting the INTE control bit to 0. Not present on "JR" boards. */ #define DAS08_STATUS_IRQ BIT(3) /* latched interrupt input */ -#define DAS08_IP(x) (((x)>>4)&0x7) +/* digital inputs (not "JR" boards) */ +#define DAS08_STATUS_DI(x) (((x) & 0x70) >> 4) #define DAS08_CONTROL 2 #define DAS08_MUX_MASK 0x7 #define DAS08_MUX(x) ((x) & DAS08_MUX_MASK) @@ -287,7 +288,7 @@ static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { data[0] = 0; - data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS_REG)); + data[1] = DAS08_STATUS_DI(inb(dev->iobase + DAS08_STATUS_REG)); return insn->n; } -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/