From patchwork Mon Jan 25 23:14:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1431429 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=WzECn6B8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPm0l3vfjz9sCD for ; Tue, 26 Jan 2021 10:14:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C136D82540; Tue, 26 Jan 2021 00:14:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="WzECn6B8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C729C825A6; Tue, 26 Jan 2021 00:14:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 33EC580829 for ; Tue, 26 Jan 2021 00:14:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1611616464; bh=bCMClg3Kx/gUynGqC3S32/EPa9c6w8gg6GpIz67bqFs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=WzECn6B8XVR2puNpy3MHS+EYpXkGeAdJX6NIBr50n15eRLklWVuWsEyojTALLK3Yf bPDiwcEBZXA6ct8BAWnLrES3tGBZ/AvHErl+YRrOIgM7fwDhgxMRu7T7VuY9EjZ/aw xsikBbdRhAAcA/68oRV1kobb66OjKtTT7I9XKUXs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MgvvT-1leKlB2r7d-00hLW1; Tue, 26 Jan 2021 00:14:24 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Heinrich Schuchardt , Marek Szyprowski , u-boot@lists.denx.de, Christian Gmeiner , Jason Wessel Subject: [PATCH 1/1] fs: fat: remove superfluous assignments Date: Tue, 26 Jan 2021 00:14:14 +0100 Message-Id: <20210125231414.61516-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:aZa7Z/kz0wx0r/41qCq9+YfqgBSBoPtBxfx0ZDTtwyKPcyzBkrx QZb4itGfBWuro3ZCTpLeR3WJLnYts01ZnXPd1ZbVaCVoq1BRlz90NcEyg/rtpyS13JPOuam MLaBwgpma6FsfAR4bZ2iw40SV/gULRwndOwenmW4+RUb9fVXvbzBz7cCnZ43ftf5/qfRT5R DwSWDcqdbvO8i4ZG7tU2Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:RsHB/6idUDg=:g3yG1eLtrZNiSwEZwhhlJo rl8qSuIJNX6e2q4mqdfTCS/MWq8w7v7CLFFnyIHl1dypTvCRTW3B7c3Ms+9SFGhilj8di4h9j 6WMfd/ol3mLuMdg3UwWSymrb+u3Dgi6z/5YLF/2DYJjR0r2vJYu23w2cX0Ax8LmDX5AL+i1Sj rHWEUrC2yV4Uc5gqEhXwsFNYTo3JG8tc8hPKXSNuMK56lqsK02ByaaJ8vvtxZaZzCqH+bb3uz hjWN18CcDSLIQsxU/U0g/Fcji+VzA52fX1hE3tORn5Zj4iAeWbqcI2aOKYObf1EWs9/M7B/9o zZN4pO6cXhYSxoFsRgkCMYCXINkqFgQw22+zl3SGVjU8xJ3MSn6vOZ3qOvPau9DtwXWUu+LiA W5HdNtKCgI0Q3T9QbIwMl67/qVElLjtAEZlsvFWeB3SuLSQNvXKPehEz3rMe7wGhiLgovJqwI rya2rrtrM6NazsnWVqMHYA2aEW24jIvjdkkLXkNitlCwe5Dk/1oIys9ALmZ7A7fY+IngFc7DG DftAXy6YY/OJQH6l3yXRJwZgigJwdxFz4jhz5hDYhtuz2hk8gGKvJe9jLvj/GacmX89cQ+sNP xZd8VXZ12GKScSc0cYbnDfQ7W+swBKVWgcD45PiblBuWWkHdXNciYEzn5oRWJxeaNPl/70XJP ruTLo45k0hlG0mQJKMmXGPvNZWiowrpTHQoegGk39h9yVbxW0+eeIcY3jbl65kfVk9XREZfgr 2GFf2xe0viI1+5MY6JUNLU5nxpYm/zw5TZStxfYmVk5wPL/23h7BUlD6xnRln/IuAPiGgDj10 GrRHJCfBOpzXEl+PUqGJ7xSQCuIKS/VAlSJCkZT+xp0Rv3cw+3VOW3vtgeT3bjH9ebSIitoEB zouyMx9YhqgOlZLdyJgQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Do not assign a value to a variable if it is not used. Signed-off-by: Heinrich Schuchardt --- fs/fat/fat.c | 3 ++- fs/fat/fat_write.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.29.2 diff --git a/fs/fat/fat.c b/fs/fat/fat.c index fb6ce094ac..ccba268f61 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -248,7 +248,6 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) static int get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) { - __u32 idx = 0; __u32 startsect; int ret; @@ -277,6 +276,8 @@ get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) size -= mydata->sect_size; } } else { + __u32 idx; + idx = size / mydata->sect_size; if (idx == 0) ret = 0; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index aae3a6a3d1..b43a27b205 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -573,7 +573,6 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry) static int set_sectors(fsdata *mydata, u32 startsect, u8 *buffer, u32 size) { - u32 nsects = 0; int ret; debug("startsect: %d\n", startsect); @@ -595,6 +594,8 @@ set_sectors(fsdata *mydata, u32 startsect, u8 *buffer, u32 size) size -= mydata->sect_size; } } else if (size >= mydata->sect_size) { + u32 nsects; + nsects = size / mydata->sect_size; ret = disk_write(startsect, nsects, buffer); if (ret != nsects) { @@ -785,7 +786,6 @@ get_set_cluster(fsdata *mydata, __u32 clustnum, loff_t pos, __u8 *buffer, } size -= wsize; - buffer += wsize; *gotsize += wsize; } @@ -1482,10 +1482,10 @@ static int delete_single_dentry(fat_itr *itr) */ static int delete_long_name(fat_itr *itr) { - struct dir_entry *dent = itr->dent; int seqn = itr->dent->nameext.name[0] & ~LAST_LONG_ENTRY_MASK; while (seqn--) { + struct dir_entry *dent; int ret; ret = delete_single_dentry(itr);