From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964868AbcKNUQl (ORCPT ); Mon, 14 Nov 2016 15:16:41 -0500 Received: from smtp81.iad3a.emailsrvr.com ([173.203.187.81]:58977 "EHLO smtp81.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964818AbcKNUQj (ORCPT ); Mon, 14 Nov 2016 15:16:39 -0500 X-Auth-ID: abbotti@mev.co.uk X-Sender-Id: abbotti@mev.co.uk From: Ian Abbott To: devel@driverdev.osuosl.org Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] staging: comedi: ni_mio_common: remove variable 'dl' in ni_ai_insn_read() Date: Mon, 14 Nov 2016 20:16:23 +0000 Message-Id: <20161114201623.18161-4-abbotti@mev.co.uk> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161114201623.18161-1-abbotti@mev.co.uk> References: <20161114201623.18161-1-abbotti@mev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In `ni_ai_insn_read()`, local variable `dl` is declared as `unsigned long`, but `unsigned int` will do. Get rid of it and use local variable `d` instead. (That used to be `unsigned short`, but has been `unsigned int` since kernel version 3.18.) Signed-off-by: Ian Abbott --- drivers/staging/comedi/drivers/ni_mio_common.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index a974ab7..b2e3828 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1836,7 +1836,6 @@ static int ni_ai_insn_read(struct comedi_device *dev, int i, n; unsigned int signbits; unsigned int d; - unsigned long dl; ni_load_channelgain_list(dev, s, 1, &insn->chanspec); @@ -1887,15 +1886,15 @@ static int ni_ai_insn_read(struct comedi_device *dev, * bit to move a single 16bit stranded sample into * the FIFO. */ - dl = 0; + d = 0; for (i = 0; i < NI_TIMEOUT; i++) { if (ni_readl(dev, NI6143_AI_FIFO_STATUS_REG) & 0x01) { /* Get stranded sample into FIFO */ ni_writel(dev, 0x01, NI6143_AI_FIFO_CTRL_REG); - dl = ni_readl(dev, - NI6143_AI_FIFO_DATA_REG); + d = ni_readl(dev, + NI6143_AI_FIFO_DATA_REG); break; } } @@ -1903,7 +1902,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, dev_err(dev->class_dev, "timeout\n"); return -ETIME; } - data[n] = (((dl >> 16) & 0xFFFF) + signbits) & 0xFFFF; + data[n] = (((d >> 16) & 0xFFFF) + signbits) & 0xFFFF; } } else { for (n = 0; n < insn->n; n++) { @@ -1919,9 +1918,9 @@ static int ni_ai_insn_read(struct comedi_device *dev, return -ETIME; } if (devpriv->is_m_series) { - dl = ni_readl(dev, NI_M_AI_FIFO_DATA_REG); - dl &= mask; - data[n] = dl; + d = ni_readl(dev, NI_M_AI_FIFO_DATA_REG); + d &= mask; + data[n] = d; } else { d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG); d += signbits; -- 2.10.2