]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: wlan-ng: Drop wrapper function
authorBhumika Goyal <bhumirks@gmail.com>
Sat, 13 Feb 2016 13:19:34 +0000 (18:49 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Feb 2016 00:34:08 +0000 (16:34 -0800)
Drop the function prism2mgmt_pstr2bytearea and replace its function call
with the standard function memcpy that it wrapped.
The code becomes cleaner after this patch.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wlan-ng/prism2mib.c

index cdda07d1c268889408b79000493bbdc4e6973ef7..e1b2e47aae9b8662ad4af2c8197729d53e431907 100644 (file)
@@ -388,7 +388,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib,
                prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2);
        } else {
                memset(bytebuf, 0, mib->parm2);
-               prism2mgmt_pstr2bytearea(bytebuf, pstr);
+               memcpy(bytebuf, pstr->data, pstr->len);
                result =
                    hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
        }
@@ -543,7 +543,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib,
                len = (pstr->len > 5) ? HFA384x_RID_CNFWEP128DEFAULTKEY_LEN :
                    HFA384x_RID_CNFWEPDEFAULTKEY_LEN;
                memset(bytebuf, 0, len);
-               prism2mgmt_pstr2bytearea(bytebuf, pstr);
+               memcpy(bytebuf, pstr->data, pstr->len);
                result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len);
        }
 
@@ -758,26 +758,6 @@ void prism2mgmt_pstr2bytestr(struct hfa384x_bytestr *bytestr,
        memcpy(bytestr->data, pstr->data, pstr->len);
 }
 
-/*----------------------------------------------------------------
-* prism2mgmt_pstr2bytearea
-*
-* Convert the pstr data in the WLAN message structure into an hfa384x
-* byte area format.
-*
-* Arguments:
-*      bytearea        hfa384x byte area data type
-*      pstr            wlan message data
-*
-* Returns:
-*      Nothing
-*
-----------------------------------------------------------------*/
-
-void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
-{
-       memcpy(bytearea, pstr->data, pstr->len);
-}
-
 /*----------------------------------------------------------------
 * prism2mgmt_bytestr2pstr
 *