From patchwork Tue May 3 06:40:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 617818 X-Patchwork-Delegate: andreas.biessmann@googlemail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qzWnQ2sdHz9t49 for ; Tue, 3 May 2016 16:42:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=XGac3N58; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0C81FA775D; Tue, 3 May 2016 08:41:40 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KntoKaUXMt3t; Tue, 3 May 2016 08:41:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2968BA769F; Tue, 3 May 2016 08:40:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 14E0AA7716 for ; Tue, 3 May 2016 08:40:49 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id snwAlsJ1gfFx for ; Tue, 3 May 2016 08:40:48 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f177.google.com (mail-io0-f177.google.com [209.85.223.177]) by theia.denx.de (Postfix) with ESMTPS id E1875A76B1 for ; Tue, 3 May 2016 08:40:37 +0200 (CEST) Received: by mail-io0-f177.google.com with SMTP id d62so13705859iof.2 for ; Mon, 02 May 2016 23:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pl9lqWEETufI6n+4OM9zLxLf5ETpjkpFNcYllHaHTBg=; b=XGac3N58LpDM9y2eguJaduOL4jcOZoiZ0T57bnIaZx01hgMOEmHta7+pg/yaPIm/cD iki53aP6xnn1+lEbHgLrloRlbkwiURrO2xsxwiYFhlSNxb2NUP/QygE/GCLZKl12wg+Q DqTLy0isQRUF6b2Y19nPHVnmUxxOkk/bdu4TdLMcJeosocuEzZCnsixbs+RQhTnn6HoI 9VImBdt7HJm2/zANyfu4/uXiy8G0/eHy5w0TM3NSac5+fykHwF+L4LWCk1yidLYOiHR8 v5wx3vySdclkm+6uyXCHcdiHlhWZTPkwHsxE/X07A21Ortdzm4m9xVXpYImb15nv+PHx fUCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Pl9lqWEETufI6n+4OM9zLxLf5ETpjkpFNcYllHaHTBg=; b=RgkFCBpU9Ezzdqi9/4/ED367FwQo1qIcx5+lsbrREqN2Vk6pyRCjUJKhEnYrQahyUH 0Dm/D8O+oWxO7+qlT5WS5Q8broJQfUBxc6bqT6CdopnSlRbLWMlEo87t5fV9HxRopR8c qJEmkQC/cuPa/sYW4eOCP6yLk3bDfDve/TC/ekJl5rQNI/UCBSFaLigIAuUFfP0pT4hQ l3GQCNMI0tewZyaPtuVVFNiN2MIiGy/j24PnHLTPLmRttCnTBzfTOtYVj+Q82vhwiVsh r/tP8t+ipWw8bDg2KHFbEYj0t3LMkZUO2EMkxXmRgsi37uVZ9M0JNQ31bS96zvFyxchp Af3Q== X-Gm-Message-State: AOPr4FUTLK2k5u5bFNBSCK6Kpj3JBsJngSENjbNcEoWBYZ2RNdm9Zuu4uSHbEi9+8KaadGko X-Received: by 10.107.20.202 with SMTP id 193mr1278785iou.154.1462257636647; Mon, 02 May 2016 23:40:36 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.57]) by smtp.gmail.com with ESMTPSA id qn2sm1362468igc.20.2016.05.02.23.40.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2016 23:40:33 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 791F52210CB; Tue, 3 May 2016 00:40:25 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 3 May 2016 00:40:06 -0600 Message-Id: <1462257612-28746-13-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1462257612-28746-1-git-send-email-sjg@chromium.org> References: <1462257612-28746-1-git-send-email-sjg@chromium.org> Cc: Scott Wood , Scott Wood Subject: [U-Boot] [PATCH 12/18] mtd: nand: Drop a blank line in nand_wait() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This empty line should not be there. Remove it. Signed-off-by: Simon Glass --- drivers/mtd/nand/nand_base.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 9e8fc1f..bcd4d70 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -877,7 +877,6 @@ static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, */ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) { - int status, state = chip->state; unsigned long timeo = (state == FL_ERASING ? 400 : 20);