From patchwork Wed Jul 15 20:11:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1329787 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=none (p=none dis=none) header.from=bootlin.com 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6T7X2Ty8z9sRk for ; Thu, 16 Jul 2020 06:12:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 34D4881BC5; Wed, 15 Jul 2020 22:11:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 93BFF81B65; Wed, 15 Jul 2020 22:11:52 +0200 (CEST) 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,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 08CC281B65 for ; Wed, 15 Jul 2020 22:11:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=thomas.petazzoni@bootlin.com X-Originating-IP: 90.30.52.66 Received: from localhost (lfbn-bay-1-589-66.w90-30.abo.wanadoo.fr [90.30.52.66]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 39755C0002; Wed, 15 Jul 2020 20:11:49 +0000 (UTC) From: Thomas Petazzoni To: Joao Marcos Costa Cc: u-boot@lists.denx.de, miquel.raynal@bootlin.com, Thomas Petazzoni Subject: [PATCH 1/3] cmd/sqfs.c, include/fs.h: fix build failures, don't expose do_sqfs_*() functions globally Date: Wed, 15 Jul 2020 22:11:41 +0200 Message-Id: <20200715201143.2168632-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715201143.2168632-1-thomas.petazzoni@bootlin.com> References: <20200709175148.17193-1-joaomarcos.costa@bootlin.com> <20200715201143.2168632-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 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 cmd_tbl_t type has been removed upstream since commit 09140113108 ("command: Remove the cmd_tbl_t typedef"), so we must use "struct cmd_tbl" instead. The include was missing in cmd/sqfs.c, without which U_BOOT_CMD() is not defined. Finally, there is no reason to globally expose do_sqfs_ls() and do_sqfs_load(), they are only used within cmd/sqfs.c. This allows to drop the do_sqfs_load() prototype from include/fs.h. Signed-off-by: Thomas Petazzoni --- cmd/sqfs.c | 5 +++-- include/fs.h | 12 ------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/cmd/sqfs.c b/cmd/sqfs.c index af42df728b..177008e802 100644 --- a/cmd/sqfs.c +++ b/cmd/sqfs.c @@ -7,10 +7,11 @@ * squashfs.c: implements SquashFS related commands */ +#include #include #include -int do_sqfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_sqfs_ls(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { return do_ls(cmdtp, flag, argc, argv, FS_TYPE_SQUASHFS); } @@ -22,7 +23,7 @@ U_BOOT_CMD( " - list files from 'dev' on 'interface' in 'directory'\n" ); -int do_sqfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_sqfs_load(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { return do_load(cmdtp, flag, argc, argv, FS_TYPE_SQUASHFS); } diff --git a/include/fs.h b/include/fs.h index 19f4afc482..0794b50d10 100644 --- a/include/fs.h +++ b/include/fs.h @@ -42,18 +42,6 @@ int do_fat_fsload(struct cmd_tbl *cmdtp, int flag, int argc, */ int do_ext2load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); - -/** - * do_sqfs_load - Run the sqfsload command - * - * @cmdtp: Command information for sqfsload - * @flag: Command flags (CMD_FLAG_...) - * @argc: Number of arguments - * @argv: List of arguments - * @return result (see enum command_ret_t) - */ -int do_sqfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); - /* * Tell the fs layer which block device an partition to use for future * commands. This also internally identifies the filesystem that is present