* [patch] libertas: remove some dead code in if_spi_prog_helper_firmware()
@ 2011-08-06 14:23 Dan Carpenter
2011-08-15 22:51 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-08-06 14:23 UTC (permalink / raw)
To: Dan Williams
Cc: John W. Linville, open list:MARVELL LIBERTAS...,
open list:NETWORKING [WIREL..., kernel-janitors
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] libertas: remove some dead code in if_spi_prog_helper_firmware()
2011-08-06 14:23 [patch] libertas: remove some dead code in if_spi_prog_helper_firmware() Dan Carpenter
@ 2011-08-15 22:51 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2011-08-15 22:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: John W. Linville, open list:MARVELL LIBERTAS...,
open list:NETWORKING [WIREL..., kernel-janitors
On Sat, 2011-08-06 at 07:23 -0700, Dan Carpenter wrote:
> 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>
Acked-by: Dan Williams <dcbw@redhat.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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-15 22:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-06 14:23 [patch] libertas: remove some dead code in if_spi_prog_helper_firmware() Dan Carpenter
2011-08-15 22:51 ` Dan Williams
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).