From: Dan Carpenter <error27@gmail.com>
To: Dan Williams <dcbw@redhat.com>
Cc: "John W. Linville" <linville@tuxdriver.com>,
"open list:MARVELL LIBERTAS..."
<libertas-dev@lists.infradead.org>,
"open list:NETWORKING [WIREL..." <linux-wireless@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: [patch] libertas: remove some dead code in
Date: Sat, 06 Aug 2011 14:23:44 +0000 [thread overview]
Message-ID: <20110806142344.GA10373@mwanda> (raw)
We always hit the goto and skip the printk(). The original code does
the right thing even though it looks messy.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index e0286cf..622ae6d 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -531,10 +531,6 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card,
goto out;
err = spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG,
IF_SPI_CIC_CMD_DOWNLOAD_OVER);
- goto out;
-
- lbs_deb_spi("waiting for helper to boot...\n");
-
out:
if (err)
pr_err("failed to load helper firmware (err=%d)\n", err);
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Dan Williams <dcbw@redhat.com>
Cc: "John W. Linville" <linville@tuxdriver.com>,
"open list:MARVELL LIBERTAS..."
<libertas-dev@lists.infradead.org>,
"open list:NETWORKING [WIREL..." <linux-wireless@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: [patch] libertas: remove some dead code in if_spi_prog_helper_firmware()
Date: Sat, 6 Aug 2011 07:23:44 -0700 [thread overview]
Message-ID: <20110806142344.GA10373@mwanda> (raw)
We always hit the goto and skip the printk(). The original code does
the right thing even though it looks messy.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index e0286cf..622ae6d 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -531,10 +531,6 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card,
goto out;
err = spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG,
IF_SPI_CIC_CMD_DOWNLOAD_OVER);
- goto out;
-
- lbs_deb_spi("waiting for helper to boot...\n");
-
out:
if (err)
pr_err("failed to load helper firmware (err=%d)\n", err);
next reply other threads:[~2011-08-06 14:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-06 14:23 Dan Carpenter [this message]
2011-08-06 14:23 ` [patch] libertas: remove some dead code in if_spi_prog_helper_firmware() Dan Carpenter
2011-08-15 22:51 ` [patch] libertas: remove some dead code in Dan Williams
2011-08-15 22:51 ` [patch] libertas: remove some dead code in if_spi_prog_helper_firmware() Dan Williams
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=20110806142344.GA10373@mwanda \
--to=error27@gmail.com \
--cc=dcbw@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.