From patchwork Fri Dec 25 14:11:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1420620 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; dmarc=fail (p=none dis=none) header.from=gmx.de 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=Z+1jlSYx; 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 4D2TRN2q0qz9sVt for ; Sat, 26 Dec 2020 01:12:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 075588266E; Fri, 25 Dec 2020 15:12:02 +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="Z+1jlSYx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E806826AC; Fri, 25 Dec 2020 15:12:00 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (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 5AA908266A for ; Fri, 25 Dec 2020 15:11:57 +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=1608905511; bh=080UGCTgVCzY5IZbD/hCZMHT5hkts8c6ypCCYNFQF4g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Z+1jlSYxqYkaVucdtbPpztlRwL2xiGL/TVuj08QyKv94GqSzS5L5IJmpKO+O+2HnM AdnlWxTMyT4Qpv4WZu5puGXNXYyQnuG2Eb6iyG/m4Gg2DXURbmtgVSwWIoKqrOvkNd NygBGatWgOqD9MEkZvLEiyjEXVM2XF5iLnpRVbVc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MQMuR-1kfF380rhJ-00MNZy; Fri, 25 Dec 2020 15:11:51 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , Christian Gmeiner , Jason Wessel , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH] fs: fat: eliminate DIRENTSPERBLOCK() macro Date: Fri, 25 Dec 2020 15:11:46 +0100 Message-Id: <20201225141146.35095-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:QLkuILB0f54wVjLEivg3dNBY4FHQ13KJ3mAsFtrCGbYn8K4ME96 BuOMi7pY/ICWTDwzgbRrpB2d/NXn3YE4DJ7PJFB1ngxo++/pPvw4MHQVCp5I9fIMBeneGpm yXwIzJXjWWO8SY+Dst3lI6QrljosjkcZlmfcvwZ86WOk38YyIkx9YQTRiDe0SuVqfbhzOFM coQPfKIVj+TQTSiIF47KA== X-UI-Out-Filterresults: notjunk:1;V03:K0:7Q6qka1nBS8=:A5Aoim+OLZ5Rt20CXAPul8 VF76YYuwex17ofWhaRkTZQp0+NR2VcMkB0n/F1TEoBiPsHjvLzslcfwak2nE245PaPrywTmqN ppTbg2piOByKgWz3OyUgbmELdVi+smupbtVl4K+fdVGkdbIq5KAPdTbDmea3yGTcAbQIY+5VF Yc61kT40kDVQcmRK7WxlUW3ZVS5fu7F+RX9nNF11Bx5FXw7vu+jr5eqdquPbsNBfQ/4GyT6d4 t3/oZjpEE1dXoHeH7PYC8feXZ8g1H1lC/VeguEwzDfwTsOSOfEFU2F7hnvh6CktQXK2uEB41I jgMJHJRdonb1U9BSiScE/Va9XyAGBJjNySZODKoYdm7YCIw2ciWUqWX8iNnPFjVO6LvWkoynd DN/RVPhsWneHLR263PiU1d16xSb23dAGb06nx5KnPZDy7fuZ0X9rzEi8dzg6gZLKZetxSHheH a1jW62puBYuROxp2SDwhuhOg1FanNvEWp2PNe99BBrwWi4xI6TFGA2PQMiUul9Wni1fvUO9kA vEm7tWk9LCmhSSktASrlftsRqZgKUr17I7Lk+OB5AVWd29pnRKkuFBYTtbF3oa5kr+V2UOTxp SKjZII6QWeJEHXDTiJ0Ik37kFJF3QyKHLVJSD31CCGMjBN8mc1DJnemk2ujCznq64mdmkIgIf kNwsAhFr0vAS96Xl5K83t14HpjZxBej4acACHbsoCSU6/dzKZibrMTEGKl8oHZcLOE83O7Bjh kyDg+CK/Pa/j8W05pHVmgWsYf6DM5wplo/mOAdbhfocmaSXBQiM21aNndnrF+HwHAzuc1HNOD 5xjkEioedbO87XsEec1DS/TBm0onfOkFQmjj3TU7FL3dN18+uiW99YiVmG6dxD8AJZpJhqWgj jiUK1K9FahmmNj2CFa7w== 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 The FAT filesystem implementation uses several marcros referring to a magic variable name mydata which renders the code less readable. Eliminate one of them which is only used for a debug() statement. Use log_debug() instead of debug(). Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- Applicable to origin/next --- fs/fat/fat.c | 5 ++--- include/fat.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.29.2 diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 3141c7191a..17afe99584 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -811,7 +811,6 @@ static void fat_itr_child(fat_itr *itr, fat_itr *parent) */ void *fat_next_cluster(fat_itr *itr, unsigned int *nbytes) { - fsdata *mydata = itr->fsdata; /* for silly macros */ int ret; u32 sect; u32 read_size; @@ -839,8 +838,8 @@ void *fat_next_cluster(fat_itr *itr, unsigned int *nbytes) read_size = itr->fsdata->clust_size; } - debug("FAT read(sect=%d), clust_size=%d, read_size=%u, DIRENTSPERBLOCK=%zd\n", - sect, itr->fsdata->clust_size, read_size, DIRENTSPERBLOCK); + log_debug("FAT read(sect=%d), clust_size=%d, read_size=%u\n", + sect, itr->fsdata->clust_size, read_size); /* * NOTE: do_fat_read_at() had complicated logic to deal w/ diff --git a/include/fat.h b/include/fat.h index 3c29a4484d..8cae283030 100644 --- a/include/fat.h +++ b/include/fat.h @@ -22,7 +22,6 @@ struct disk_partition; #define MAX_CLUSTSIZE CONFIG_FS_FAT_MAX_CLUSTSIZE -#define DIRENTSPERBLOCK (mydata->sect_size / sizeof(dir_entry)) #define DIRENTSPERCLUST ((mydata->clust_size * mydata->sect_size) / \ sizeof(dir_entry))