Commit fc40ca92 authored by Sasha Levin's avatar Sasha Levin Committed by John W. Linville
Browse files

wireless: mwifiex: remove unreachable paths



We know 'firmware' is non-NULL from the beginning of mwifiex_prog_fw_w_helper,
remove all !firmware paths from the rest of the function.
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6960af6d
......@@ -786,21 +786,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
return 0;
}
/* This function reads one block of firmware data. */
static int mwifiex_get_fw_data(struct mwifiex_adapter *adapter,
u32 offset, u32 len, u8 *buf)
{
if (!buf || !len)
return -1;
if (offset + len > adapter->firmware->size)
return -1;
memcpy(buf, adapter->firmware->data + offset, len);
return 0;
}
static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
struct mwifiex_fw_image *fw)
{
......@@ -836,23 +821,14 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
dlen = 0;
} else {
/* copy the header of the fw_data to get the length */
if (firmware)
memcpy(&fwdata->fw_hdr, &firmware[tlen],
sizeof(struct fw_header));
else
mwifiex_get_fw_data(adapter, tlen,
sizeof(struct fw_header),
(u8 *)&fwdata->fw_hdr);
memcpy(&fwdata->fw_hdr, &firmware[tlen],
sizeof(struct fw_header));
dlen = le32_to_cpu(fwdata->fw_hdr.data_len);
dnld_cmd = le32_to_cpu(fwdata->fw_hdr.dnld_cmd);
tlen += sizeof(struct fw_header);
if (firmware)
memcpy(fwdata->data, &firmware[tlen], dlen);
else
mwifiex_get_fw_data(adapter, tlen, dlen,
(u8 *)fwdata->data);
memcpy(fwdata->data, &firmware[tlen], dlen);
fwdata->seq_num = cpu_to_le32(fw_seqnum);
tlen += dlen;
......
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