From: Sasha Levin <sasha.levin@oracle.com>
To: Bing Zhao <bzhao@marvell.com>,
"John W. Linville" <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Sasha Levin <sasha.levin@oracle.com>
Subject: [PATCH] wireless: mwifiex: remove unreachable paths
Date: Thu, 20 Dec 2012 14:11:25 -0500 [thread overview]
Message-ID: <1356030701-16284-17-git-send-email-sasha.levin@oracle.com> (raw)
In-Reply-To: <1356030701-16284-1-git-send-email-sasha.levin@oracle.com>
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: Sasha Levin <sasha.levin@oracle.com>
---
drivers/net/wireless/mwifiex/usb.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
index 63ac9f2..8bd7098 100644
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -836,23 +836,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;
--
1.8.0
next prev parent reply other threads:[~2012-12-20 19:19 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 19:11 [PATCH] tools, power: correct precedence of operators in init_maxfreq_mode Sasha Levin
2012-12-20 19:11 ` [PATCH] kvm tools: remove unneeded checks in qcow code Sasha Levin
2012-12-21 22:03 ` Jesper Juhl
2012-12-20 19:11 ` [PATCH] kvm tools: remove unneeded check from disk code Sasha Levin
2012-12-20 19:11 ` [PATCH] kvm tools: correctly compare pointer with NULL instead of 0 Sasha Levin
2012-12-20 19:11 ` [PATCH] tools lib traceevent: remove redundant check from process_dynamic_array Sasha Levin
2012-12-21 12:58 ` Namhyung Kim
2012-12-20 19:11 ` [PATCH] epoll: stop comparing pointers with 0 in self-test app Sasha Levin
2012-12-21 2:55 ` Daniel Hazelton
2012-12-20 19:11 ` [PATCH] tools/usb: remove unneeded 'continue' and simplify condition Sasha Levin
2012-12-20 20:32 ` Felipe Balbi
2012-12-20 19:11 ` [PATCH] perf kmem: use ARRAY_SIZE instead of reinventing it Sasha Levin
2013-01-25 11:19 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] cpupowerutils: don't compare pointers with 0 Sasha Levin
2012-12-21 21:41 ` Thomas Renninger
2012-12-20 19:11 ` [PATCH] m2m-deinterlace: use correct check for kzalloc failure Sasha Levin
2012-12-20 19:11 ` [PATCH] perf script: use ARRAY_SIZE instead of reinventing it Sasha Levin
2013-01-25 11:20 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] perf tools: remove redundant checks from _sort__sym_cmp Sasha Levin
2012-12-21 12:55 ` Namhyung Kim
2013-01-25 11:17 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] virtio_console: correct error message on failure of debugfs_create_dir Sasha Levin
2012-12-21 7:59 ` Amit Shah
2012-12-24 11:55 ` Arnd Bergmann
2012-12-24 17:39 ` Greg Kroah-Hartman
2012-12-24 18:24 ` Sasha Levin
2012-12-24 18:43 ` Greg Kroah-Hartman
2012-12-20 19:11 ` [PATCH] debugfs: remove redundant initialization of dentry Sasha Levin
2012-12-20 19:11 ` [PATCH] PCI: cpqphp: minor cleanup and removal of unreachable paths Sasha Levin
2013-01-07 18:48 ` Bjorn Helgaas
2012-12-20 19:11 ` [PATCH] bnx2x: use ARRAY_SIZE where possible Sasha Levin
2012-12-23 8:49 ` Eilon Greenstein
2012-12-28 4:30 ` David Miller
2012-12-20 19:11 ` Sasha Levin [this message]
2012-12-20 20:13 ` [PATCH] wireless: mwifiex: remove unreachable paths Bing Zhao
2012-12-20 19:11 ` [PATCH] mmc: omap_hsmmc: correct precedence of operators Sasha Levin
2012-12-20 20:30 ` Felipe Balbi
2012-12-20 23:04 ` Paul Walmsley
2012-12-20 19:11 ` [PATCH] kdb: use ARRAY_SIZE where possible Sasha Levin
2012-12-20 19:11 ` [PATCH] rcutorture: don't compare ptr with 0 Sasha Levin
2012-12-20 22:39 ` Josh Triplett
2013-01-04 17:27 ` Paul E. McKenney
2012-12-20 19:11 ` [PATCH] sched: fair: simplify can_migrate_task a bit Sasha Levin
2012-12-20 19:11 ` [PATCH] uprobes: remove redundant check Sasha Levin
2013-01-25 11:21 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] cgroup: " Sasha Levin
2012-12-20 19:18 ` Tejun Heo
2012-12-20 19:24 ` Sasha Levin
2012-12-20 19:11 ` [PATCH] mm: memory_hotplug: no need to check res twice in add_memory Sasha Levin
2012-12-20 19:11 ` [PATCH] x86, efi: correct precedence of operators in setup_efi_pci Sasha Levin
2012-12-20 19:59 ` [tip:x86/urgent] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] arch/x86/platform/uv: use ARRAY_SIZE where possible Sasha Levin
2012-12-20 22:37 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] um: don't compare a pointer to 0 Sasha Levin
2012-12-20 22:39 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] x86, apb_timer: remove unused variable percpu_timer Sasha Levin
2012-12-20 22:40 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] kdb: use DIV_ROUND_UP where possible Sasha Levin
2012-12-20 19:11 ` [PATCH] mm/sparse: don't check return value of alloc_bootmem calls Sasha Levin
2012-12-20 20:23 ` David Rientjes
2012-12-20 20:36 ` Sasha Levin
2012-12-20 20:43 ` David Rientjes
2012-12-20 19:11 ` [PATCH] slob: use DIV_ROUND_UP where possible Sasha Levin
2012-12-20 19:40 ` Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356030701-16284-17-git-send-email-sasha.levin@oracle.com \
--to=sasha.levin@oracle.com \
--cc=bzhao@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).