From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Hartkopp Subject: Re: [PATCH] net: can: remove custom hex_to_bin() Date: Mon, 18 Jul 2011 16:02:49 +0200 Message-ID: <4E243D09.9020800@hartkopp.net> References: <1310977597-9666-1-git-send-email-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Wolfgang Grandegger To: Andy Shevchenko Return-path: Received: from mo-p00-ob.rzone.de ([81.169.146.162]:44862 "EHLO mo-p00-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751291Ab1GROCw (ORCPT ); Mon, 18 Jul 2011 10:02:52 -0400 In-Reply-To: <1310977597-9666-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: netdev-owner@vger.kernel.org List-ID: On 18.07.2011 10:26, Andy Shevchenko wrote: > Signed-off-by: Andy Shevchenko > Cc: Wolfgang Grandegger Acked-by: Oliver Hartkopp > --- > drivers/net/can/slcan.c | 26 +++++--------------------- > 1 files changed, 5 insertions(+), 21 deletions(-) > > diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c > index aa8ad73..65e54fd 100644 > --- a/drivers/net/can/slcan.c > +++ b/drivers/net/can/slcan.c > @@ -56,6 +56,7 @@ > #include > #include > #include > +#include > #include > > static __initdata const char banner[] = > @@ -142,21 +143,6 @@ static struct net_device **slcan_devs; > * STANDARD SLCAN DECAPSULATION * > ************************************************************************/ > > -static int asc2nibble(char c) > -{ > - > - if ((c >= '0') && (c <= '9')) > - return c - '0'; > - > - if ((c >= 'A') && (c <= 'F')) > - return c - 'A' + 10; > - > - if ((c >= 'a') && (c <= 'f')) > - return c - 'a' + 10; > - > - return 16; /* error */ > -} > - > /* Send one completely decapsulated can_frame to the network layer */ > static void slc_bump(struct slcan *sl) > { > @@ -195,18 +181,16 @@ static void slc_bump(struct slcan *sl) > *(u64 *) (&cf.data) = 0; /* clear payload */ > > for (i = 0, dlc_pos++; i < cf.can_dlc; i++) { > - > - tmp = asc2nibble(sl->rbuff[dlc_pos++]); > - if (tmp > 0x0F) > + tmp = hex_to_bin(sl->rbuff[dlc_pos++]); > + if (tmp < 0) > return; > cf.data[i] = (tmp << 4); > - tmp = asc2nibble(sl->rbuff[dlc_pos++]); > - if (tmp > 0x0F) > + tmp = hex_to_bin(sl->rbuff[dlc_pos++]); > + if (tmp < 0) > return; > cf.data[i] |= tmp; > } > > - > skb = dev_alloc_skb(sizeof(struct can_frame)); > if (!skb) > return;