From patchwork Sat Aug 6 14:23:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1041662 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p76EOKPE027946 for ; Sat, 6 Aug 2011 14:24:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752339Ab1HFOYM (ORCPT ); Sat, 6 Aug 2011 10:24:12 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:33673 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658Ab1HFOYL (ORCPT ); Sat, 6 Aug 2011 10:24:11 -0400 Received: by fxh19 with SMTP id 19so3755532fxh.19 for ; Sat, 06 Aug 2011 07:24:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=QU+78pRKtp9NcX3imwvLb05lCgaAposN3GZNznno8eo=; b=wZpxFmyq+iTRvRvKkY1wQo/q2ZIu48jdvWVjU8JTGMCS6Q/vjwJB/avCCzmFB6P5p5 cwS+WG4xXec8ADYhHv46hCArLYfOJz1UYxRtC71pQiqoAFztyOk7GMw0Xo1K5sdOe75M PW5t4IkxgnWQP+8BL9/be+WRawZ+0fJJQqX2Y= Received: by 10.223.60.193 with SMTP id q1mr1720502fah.74.1312640649759; Sat, 06 Aug 2011 07:24:09 -0700 (PDT) Received: from mwanda ([212.49.88.34]) by mx.google.com with ESMTPS id h17sm2189426fai.14.2011.08.06.07.24.04 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Aug 2011 07:24:09 -0700 (PDT) Date: Sat, 6 Aug 2011 07:23:44 -0700 From: Dan Carpenter To: Dan Williams Cc: "John W. Linville" , "open list:MARVELL LIBERTAS..." , "open list:NETWORKING [WIREL..." , kernel-janitors@vger.kernel.org Subject: [patch] libertas: remove some dead code in if_spi_prog_helper_firmware() Message-ID: <20110806142344.GA10373@mwanda> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 06 Aug 2011 14:24:21 +0000 (UTC) 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 --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);