From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Date: Mon, 15 Aug 2011 22:51:54 +0000 Subject: Re: [patch] libertas: remove some dead code in Message-Id: <1313448716.6103.14.camel@dcbw.foobar.com> List-Id: References: <20110806142344.GA10373@mwanda> In-Reply-To: <20110806142344.GA10373@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: "John W. Linville" , "open list:MARVELL LIBERTAS..." , "open list:NETWORKING [WIREL..." , kernel-janitors@vger.kernel.org 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 Acked-by: Dan Williams > > 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);