Skip to content

Commit

Permalink
mwifiex: remove redundant local structures
Browse files Browse the repository at this point in the history
Avoid use of local structure in the function if the structure is
already allocated by the caller and the structure pointer is passed.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Amitkumar Karwar authored and John W. Linville committed May 11, 2011
1 parent 0fd82ea commit c4859fb
Showing 1 changed file with 9 additions and 19 deletions.
28 changes: 9 additions & 19 deletions drivers/net/wireless/mwifiex/sta_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,11 +1250,9 @@ mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, char *version,
int mwifiex_get_signal_info(struct mwifiex_private *priv,
struct mwifiex_ds_get_signal *signal)
{
struct mwifiex_ds_get_signal info;
int status;

memset(&info, 0, sizeof(struct mwifiex_ds_get_signal));
info.selector = ALL_RSSI_INFO_MASK;
signal->selector = ALL_RSSI_INFO_MASK;

/* Signal info can be obtained only if connected */
if (!priv->media_connected) {
Expand All @@ -1267,13 +1265,10 @@ int mwifiex_get_signal_info(struct mwifiex_private *priv,
HostCmd_ACT_GEN_GET, 0, signal);

if (!status) {
if (signal)
memcpy(signal, &info,
sizeof(struct mwifiex_ds_get_signal));
if (info.selector & BCN_RSSI_AVG_MASK)
priv->w_stats.qual.level = info.bcn_rssi_avg;
if (info.selector & BCN_NF_AVG_MASK)
priv->w_stats.qual.noise = info.bcn_nf_avg;
if (signal->selector & BCN_RSSI_AVG_MASK)
priv->w_stats.qual.level = signal->bcn_rssi_avg;
if (signal->selector & BCN_NF_AVG_MASK)
priv->w_stats.qual.noise = signal->bcn_nf_avg;
}

return status;
Expand Down Expand Up @@ -1333,19 +1328,14 @@ mwifiex_get_stats_info(struct mwifiex_private *priv,
struct mwifiex_ds_get_stats *log)
{
int ret;
struct mwifiex_ds_get_stats get_log;

memset(&get_log, 0, sizeof(struct mwifiex_ds_get_stats));
ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_GET_LOG,
HostCmd_ACT_GEN_GET, 0, &get_log);
HostCmd_ACT_GEN_GET, 0, log);

if (!ret) {
if (log)
memcpy(log, &get_log, sizeof(struct
mwifiex_ds_get_stats));
priv->w_stats.discard.fragment = get_log.fcs_error;
priv->w_stats.discard.retries = get_log.retry;
priv->w_stats.discard.misc = get_log.ack_failure;
priv->w_stats.discard.fragment = log->fcs_error;
priv->w_stats.discard.retries = log->retry;
priv->w_stats.discard.misc = log->ack_failure;
}

return ret;
Expand Down

0 comments on commit c4859fb

Please sign in to comment.