From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753062AbcGYQEm (ORCPT ); Mon, 25 Jul 2016 12:04:42 -0400 Received: from smtprelay0236.hostedemail.com ([216.40.44.236]:35068 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752905AbcGYQEe (ORCPT ); Mon, 25 Jul 2016 12:04:34 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::,RULES_HIT:41:355:379:541:599:800:857:960:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3871:3873:4321:5007:7875:7901:7904:10004:10400:10481:10848:11026:11232:11658:11783:11914:12043:12296:12438:12517:12519:12555:12740:13439:13894:14181:14659:14721:19900:21080:21433:30054:30064:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: light60_6198458ebd248 X-Filterd-Recvd-Size: 3404 Message-ID: <1469462669.1900.181.camel@perches.com> Subject: Re: [PATCH 3/3] mdacon: replace MDA_ADDR macro by inline function From: Joe Perches To: Jiri Slaby , tomi.valkeinen@ti.com Cc: plagnioj@jcrosoft.com, linux-fbdev@vger.kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Date: Mon, 25 Jul 2016 09:04:29 -0700 In-Reply-To: <20160725152440.6734-3-jslaby@suse.cz> References: <20160725152440.6734-1-jslaby@suse.cz> <20160725152440.6734-3-jslaby@suse.cz> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2016-07-25 at 17:24 +0200, Jiri Slaby wrote: > MDA_ADDR is one of those macros which could be an inline function. So > convert MDA_ADDR to mda_addr. > > Signed-off-by: Jiri Slaby > --- >  drivers/video/console/mdacon.c | 19 +++++++++++-------- >  1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c > index 814606bd26d1..24fe55134eb5 100644 > --- a/drivers/video/console/mdacon.c > +++ b/drivers/video/console/mdacon.c > @@ -420,17 +420,20 @@ static void mdacon_invert_region(struct vc_data *c, u16 *p, int count) >   } >  } >   > -#define MDA_ADDR(x, y)  (mda_vram_base + (y)*mda_num_columns + (x)) > +static inline u16 *mda_addr(unsigned int x, unsigned int y) Are you sure about the unsigned? All of the changed use are taking int > +{ > + return mda_vram_base + y * mda_num_columns + x; > +} >   >  static void mdacon_putc(struct vc_data *c, int ch, int y, int x) >  { > - scr_writew(mda_convert_attr(ch), MDA_ADDR(x, y)); > + scr_writew(mda_convert_attr(ch), mda_addr(x, y)); >  } >   >  static void mdacon_putcs(struct vc_data *c, const unsigned short *s, >            int count, int y, int x) >  { > - u16 *dest = MDA_ADDR(x, y); > + u16 *dest = mda_addr(x, y); >   >   for (; count > 0; count--) { >   scr_writew(mda_convert_attr(scr_readw(s++)), dest++); > @@ -440,7 +443,7 @@ static void mdacon_putcs(struct vc_data *c, const unsigned short *s, >  static void mdacon_clear(struct vc_data *c, int y, int x,  >     int height, int width) >  { > - u16 *dest = MDA_ADDR(x, y); > + u16 *dest = mda_addr(x, y); >   u16 eattr = mda_convert_attr(c->vc_video_erase_char); >   >   if (width <= 0 || height <= 0) > @@ -511,16 +514,16 @@ static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines) >   switch (dir) { >   >   case SM_UP: > - scr_memmovew(MDA_ADDR(0,t), MDA_ADDR(0,t+lines), > + scr_memmovew(mda_addr(0, t), mda_addr(0, t + lines), >   (b-t-lines)*mda_num_columns*2); > - scr_memsetw(MDA_ADDR(0,b-lines), eattr, > + scr_memsetw(mda_addr(0, b - lines), eattr, >   lines*mda_num_columns*2); >   break; >   >   case SM_DOWN: > - scr_memmovew(MDA_ADDR(0,t+lines), MDA_ADDR(0,t), > + scr_memmovew(mda_addr(0, t + lines), mda_addr(0, t), >   (b-t-lines)*mda_num_columns*2); > - scr_memsetw(MDA_ADDR(0,t), eattr, lines*mda_num_columns*2); > + scr_memsetw(mda_addr(0, t), eattr, lines*mda_num_columns*2); >   break; >   } >   From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Date: Mon, 25 Jul 2016 16:04:29 +0000 Subject: Re: [PATCH 3/3] mdacon: replace MDA_ADDR macro by inline function Message-Id: <1469462669.1900.181.camel@perches.com> List-Id: References: <20160725152440.6734-1-jslaby@suse.cz> <20160725152440.6734-3-jslaby@suse.cz> In-Reply-To: <20160725152440.6734-3-jslaby@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Jiri Slaby , tomi.valkeinen@ti.com Cc: plagnioj@jcrosoft.com, linux-fbdev@vger.kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org On Mon, 2016-07-25 at 17:24 +0200, Jiri Slaby wrote: > MDA_ADDR is one of those macros which could be an inline function. So > convert MDA_ADDR to mda_addr. >=20 > Signed-off-by: Jiri Slaby > --- > =A0drivers/video/console/mdacon.c | 19 +++++++++++-------- > =A01 file changed, 11 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdaco= n.c > index 814606bd26d1..24fe55134eb5 100644 > --- a/drivers/video/console/mdacon.c > +++ b/drivers/video/console/mdacon.c > @@ -420,17 +420,20 @@ static void mdacon_invert_region(struct vc_data *c,= u16 *p, int count) > =A0 } > =A0} > =A0 > -#define MDA_ADDR(x, y)=A0=A0(mda_vram_base + (y)*mda_num_columns + (x)) > +static inline u16 *mda_addr(unsigned int x, unsigned int y) Are you sure about the unsigned? All of the changed use are taking int > +{ > + return mda_vram_base + y * mda_num_columns + x; > +} > =A0 > =A0static void mdacon_putc(struct vc_data *c, int ch, int y, int x) > =A0{ > - scr_writew(mda_convert_attr(ch), MDA_ADDR(x, y)); > + scr_writew(mda_convert_attr(ch), mda_addr(x, y)); > =A0} > =A0 > =A0static void mdacon_putcs(struct vc_data *c, const unsigned short *s, > =A0 =A0=A0=A0=A0=A0=A0=A0=A0=A0int count, int y, int x) > =A0{ > - u16 *dest =3D MDA_ADDR(x, y); > + u16 *dest =3D mda_addr(x, y); > =A0 > =A0 for (; count > 0; count--) { > =A0 scr_writew(mda_convert_attr(scr_readw(s++)), dest++); > @@ -440,7 +443,7 @@ static void mdacon_putcs(struct vc_data *c, const uns= igned short *s, > =A0static void mdacon_clear(struct vc_data *c, int y, int x,=A0 > =A0 =A0=A0int height, int width) > =A0{ > - u16 *dest =3D MDA_ADDR(x, y); > + u16 *dest =3D mda_addr(x, y); > =A0 u16 eattr =3D mda_convert_attr(c->vc_video_erase_char); > =A0 > =A0 if (width <=3D 0 || height <=3D 0) > @@ -511,16 +514,16 @@ static int mdacon_scroll(struct vc_data *c, int t, = int b, int dir, int lines) > =A0 switch (dir) { > =A0 > =A0 case SM_UP: > - scr_memmovew(MDA_ADDR(0,t), MDA_ADDR(0,t+lines), > + scr_memmovew(mda_addr(0, t), mda_addr(0, t + lines), > =A0 (b-t-lines)*mda_num_columns*2); > - scr_memsetw(MDA_ADDR(0,b-lines), eattr, > + scr_memsetw(mda_addr(0, b - lines), eattr, > =A0 lines*mda_num_columns*2); > =A0 break; > =A0 > =A0 case SM_DOWN: > - scr_memmovew(MDA_ADDR(0,t+lines), MDA_ADDR(0,t), > + scr_memmovew(mda_addr(0, t + lines), mda_addr(0, t), > =A0 (b-t-lines)*mda_num_columns*2); > - scr_memsetw(MDA_ADDR(0,t), eattr, lines*mda_num_columns*2); > + scr_memsetw(mda_addr(0, t), eattr, lines*mda_num_columns*2); > =A0 break; > =A0 } > =A0