From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934125AbdCLN5F (ORCPT ); Sun, 12 Mar 2017 09:57:05 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:46790 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932717AbdCLN5B (ORCPT ); Sun, 12 Mar 2017 09:57:01 -0400 Date: Sun, 12 Mar 2017 14:56:40 +0100 From: Greg KH To: simran singhal Cc: abbotti@mev.co.uk, devel@driverdev.osuosl.org, outreachy-kernel@googlegroups.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] staging: comedi: amplc_pci224: Convert macro GAT_CONFIG to static inline function Message-ID: <20170312135640.GB1209@kroah.com> References: <20170310124231.GA24231@singhal-Inspiron-5558> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170310124231.GA24231@singhal-Inspiron-5558> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 10, 2017 at 06:12:31PM +0530, simran singhal wrote: > Convert macro GAT_CONFIG to static inline function as static inline > functions are preferred over macros. This change is possible since the > arguments at all call sites have the same type. > > This was done using Coccinelle: > > @r@ > expression e; > @@ > - #define GAT_CONFIG(chan, src) e > + static inline unsigned int pci230_gat_config(unsigned int chan, > + unsigned int src) Where did you get the name from? > +{ > + return ((chan & 3) << 3) | (src & 7); > +} > > @r1@ > expression dev,reg,chan,src; > @@ > -GAT_CONFIG(chan, src) > +pci230_gat_config(chan, src) > > Also, the comment describing the macro has been removed manually. > > Signed-off-by: simran singhal > --- > drivers/staging/comedi/drivers/amplc_pci224.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c > index 2e6decf..46026f5 100644 > --- a/drivers/staging/comedi/drivers/amplc_pci224.c > +++ b/drivers/staging/comedi/drivers/amplc_pci224.c > @@ -216,8 +216,12 @@ > #define GAT_GND 1 /* GND (i.e. disabled) */ > #define GAT_EXT 2 /* reserved (external gate input) */ > #define GAT_NOUTNM2 3 /* inverted output of channel-2 modulo total */ > -/* Macro to construct gate input configuration register value. */ > -#define GAT_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) > + > +static inline unsigned int pci230_gat_config(unsigned int chan, > + unsigned int src) > +{ > + return ((chan & 3) << 3) | (src & 7); > +} > > /* > * Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI224 and PCI234: > @@ -817,10 +821,12 @@ static void pci224_ao_start_pacer(struct comedi_device *dev, > * source. > */ > /* Make sure Z2-0 is gated on. */ > - outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); > + outb(pci230_gat_config(0, GAT_VCC), > + devpriv->iobase1 + PCI224_ZGAT_SCE); Why put this on 2 lines? > /* Cascading with Z2-2. */ > /* Make sure Z2-2 is gated on. */ > - outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); > + outb(pci230_gat_config(2, GAT_VCC), > + devpriv->iobase1 + PCI224_ZGAT_SCE); Same here? thanks, greg k-h