From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753985AbaIHTOq (ORCPT ); Mon, 8 Sep 2014 15:14:46 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34267 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753289AbaIHTOq (ORCPT ); Mon, 8 Sep 2014 15:14:46 -0400 Date: Mon, 8 Sep 2014 12:14:45 -0700 From: Greg Kroah-Hartman To: Ian Abbott Cc: driverdev-devel@linuxdriverproject.org, H Hartley Sweeten , linux-kernel@vger.kernel.org Subject: Re: [PATCH] staging: comedi: amplc_pci230: fix DACOUT write Message-ID: <20140908191445.GA32320@kroah.com> References: <1408447956-10139-1-git-send-email-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1408447956-10139-1-git-send-email-abbotti@mev.co.uk> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 19, 2014 at 12:32:36PM +0100, Ian Abbott wrote: > Commit 4f9c63fe5333b27ab23ed399830c7977f6970744 ("staging: comedi: > amplc_pci230: refactor iobase addresses") removed some parentheses > (presumably to keep the line withing 80 chars) in > `pci230_ao_write_nofifo()` when writing to the DACOUT1 or DACOUT2 > registers, but it removed the wrong parentheses. Fix it. > > Signed-off-by: Ian Abbott > --- > This bug is in linux-next master and staging-next. > --- > drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c > index 0fd212f..dd69e47 100644 > --- a/drivers/staging/comedi/drivers/amplc_pci230.c > +++ b/drivers/staging/comedi/drivers/amplc_pci230.c > @@ -628,7 +628,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device *dev, > > /* Write mangled datum to appropriate DACOUT register. */ > outw(pci230_ao_mangle_datum(dev, datum), > - devpriv->daqio + ((chan) == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2); > + devpriv->daqio + (chan == 0 ? PCI230_DACOUT1 : PCI230_DACOUT2)); > } > > static inline void pci230_ao_write_fifo(struct comedi_device *dev, > -- > 2.0.4 This doesn't apply to my tree anymore, is it still needed? thanks, greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A82601BF863 for ; Mon, 8 Sep 2014 19:14:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A55158A139 for ; Mon, 8 Sep 2014 19:14:46 +0000 (UTC) Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kjAURYK9YN9s for ; Mon, 8 Sep 2014 19:14:45 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by hemlock.osuosl.org (Postfix) with ESMTPS id D1C2889AD0 for ; Mon, 8 Sep 2014 19:14:45 +0000 (UTC) Date: Mon, 8 Sep 2014 12:14:45 -0700 From: Greg Kroah-Hartman Subject: Re: [PATCH] staging: comedi: amplc_pci230: fix DACOUT write Message-ID: <20140908191445.GA32320@kroah.com> References: <1408447956-10139-1-git-send-email-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1408447956-10139-1-git-send-email-abbotti@mev.co.uk> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: Ian Abbott Cc: driverdev-devel@linuxdriverproject.org, linux-kernel@vger.kernel.org On Tue, Aug 19, 2014 at 12:32:36PM +0100, Ian Abbott wrote: > Commit 4f9c63fe5333b27ab23ed399830c7977f6970744 ("staging: comedi: > amplc_pci230: refactor iobase addresses") removed some parentheses > (presumably to keep the line withing 80 chars) in > `pci230_ao_write_nofifo()` when writing to the DACOUT1 or DACOUT2 > registers, but it removed the wrong parentheses. Fix it. > > Signed-off-by: Ian Abbott > --- > This bug is in linux-next master and staging-next. > --- > drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c > index 0fd212f..dd69e47 100644 > --- a/drivers/staging/comedi/drivers/amplc_pci230.c > +++ b/drivers/staging/comedi/drivers/amplc_pci230.c > @@ -628,7 +628,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device *dev, > > /* Write mangled datum to appropriate DACOUT register. */ > outw(pci230_ao_mangle_datum(dev, datum), > - devpriv->daqio + ((chan) == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2); > + devpriv->daqio + (chan == 0 ? PCI230_DACOUT1 : PCI230_DACOUT2)); > } > > static inline void pci230_ao_write_fifo(struct comedi_device *dev, > -- > 2.0.4 This doesn't apply to my tree anymore, is it still needed? thanks, greg k-h _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel