Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422896AbbFERiJ (ORCPT ); Fri, 5 Jun 2015 13:38:09 -0400 Received: from smtp81.iad3a.emailsrvr.com ([173.203.187.81]:51932 "EHLO smtp81.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932876AbbFERa5 (ORCPT ); Fri, 5 Jun 2015 13:30:57 -0400 X-Sender-Id: abbotti@mev.co.uk From: Ian Abbott To: Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , Subject: [PATCH 08/32] staging: comedi: das08: rename DAS08_TRIG_12BIT Date: Fri, 5 Jun 2015 18:30:11 +0100 Message-Id: <1433525435-12986-9-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: 1497 Lines: 39 The `DAS08_TRIG_12BIT` macro contains the offset to the write-only software trigger register for 12-bit or 16-bit analog-to-digital conversions. Rename the macro to `DAS08_AI_TRIG_REG` and add a comment. Signed-off-by: Ian Abbott --- drivers/staging/comedi/drivers/das08.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 1d9e6a6..fa14fa10 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -56,7 +56,7 @@ */ #define DAS08_AI_LSB_REG 0x00 /* (R) AI least significant bits */ #define DAS08_AI_MSB_REG 0x01 /* (R) AI most significant bits */ -#define DAS08_TRIG_12BIT 1 +#define DAS08_AI_TRIG_REG 0x01 /* (W) AI software trigger */ #define DAS08_STATUS 2 #define DAS08_EOC (1<<7) #define DAS08_IRQ (1<<3) @@ -251,7 +251,7 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, dev_info(dev->class_dev, "over-range\n"); /* trigger conversion */ - outb_p(0, dev->iobase + DAS08_TRIG_12BIT); + outb_p(0, dev->iobase + DAS08_AI_TRIG_REG); ret = comedi_timeout(dev, s, insn, das08_ai_eoc, 0); if (ret) -- 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/