Commit 899e5f9b authored by Ana Rey's avatar Ana Rey Committed by Greg Kroah-Hartman

staging: rtl8187se: Deleted rtl8180_len2duration functions in r8180_core.c

After the next warning messages by sparse tools:

drivers/staging/rtl8187se/r8180_core.c:1621:5: warning: symbol 'rtl8180_len2duration' was not declared. Should it be static?
drivers/staging/rtl8187se/r8180_core.c:1621:12: warning: ‘rtl8180_len2duration’ defined but not used [-Wunused-function]
 static u16 rtl8180_len2duration(u32 len, short rate, short *ext)
            ^

And the next search:
$ grep -ir rtl8180_len2duration ./*
./r8180_core.c:u16 rtl8180_len2duration(u32 len, short rate, short *ext)
Binary file ./r8187se.ko matches
Binary file ./r8187se.o matches

I decided to delete rtl8180_len2duration function.
Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0bdff0d
...@@ -1613,55 +1613,6 @@ static int rtl8180_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1613,55 +1613,6 @@ static int rtl8180_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
/* longpre 144+48 shortpre 72+24 */
u16 rtl8180_len2duration(u32 len, short rate, short *ext)
{
u16 duration;
u16 drift;
*ext = 0;
switch (rate) {
case 0: /* 1mbps */
*ext = 0;
duration = ((len+4)<<4) / 0x2;
drift = ((len+4)<<4) % 0x2;
if (drift == 0)
break;
duration++;
break;
case 1: /* 2mbps */
*ext = 0;
duration = ((len+4)<<4) / 0x4;
drift = ((len+4)<<4) % 0x4;
if (drift == 0)
break;
duration++;
break;
case 2: /* 5.5mbps */
*ext = 0;
duration = ((len+4)<<4) / 0xb;
drift = ((len+4)<<4) % 0xb;
if (drift == 0)
break;
duration++;
break;
default:
case 3: /* 11mbps */
*ext = 0;
duration = ((len+4)<<4) / 0x16;
drift = ((len+4)<<4) % 0x16;
if (drift == 0)
break;
duration++;
if (drift > 6)
break;
*ext = 1;
break;
}
return duration;
}
static void rtl8180_prepare_beacon(struct net_device *dev) static void rtl8180_prepare_beacon(struct net_device *dev)
{ {
struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment