From patchwork Thu Dec 31 22:48:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1421621 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=85.214.62.61; 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=seco.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=oBc/eM2Z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4D6Nfl07yMz9s1l for ; Fri, 1 Jan 2021 09:50:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9906282668; Thu, 31 Dec 2020 23:49:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com 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; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="oBc/eM2Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11B4382645; Thu, 31 Dec 2020 23:49:31 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 203498263A for ; Thu, 31 Dec 2020 23:49:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MDYBOIy02uGEKclYnAltkU6g3vUzTb39OjGYgHWBB/Uu3eltUA93cOTaY6Yi9kj+LctPYjzFkT1RPsZ7z0PmGFQ0yTKXiNO4A3zbdBIWkubZB9KbmVUQxHo/9IGXKP4eg3NqONswLlqh+z0HivaT2ZDxvNTS0xbElC4Ky44tNTCrannNxgmE4zP06pGg9qjlnG4DjmSBzInEd86k2xMWmiFS8WzGdF5bbcbUeFymuXT18pUDt47qQWm2HLWIsSJv1DAW0LamIVO/7PGQK1Jt1FU/YMhy2wm2Uma12kIXGIvXYw6+52PBTC/pbKvejiH6t0Pa6WvTc/l4kpZUvbtXbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rTw7YcUwtwnNHw20T4cyNNzddsGs5o3sKWz7vHE7smk=; b=j3Fw7m3xKauiY2T6AtpBfTCKMsZmcCeG9K1hAoeqZCEiBA5W4GJ4f29JAufyg9Al9Q3jAQpgGy9tp98PhmgwYtEgSRr4pCqNXvkElhPZmNxO2MYzcfVYUIYbNm6b4mVC6J9zp0hVminLi7eGqd2EZk8wRlhB53dK26GTIyG1zp0SpKcfD3IA7tbrPPJS5n2PRzVJVJ5r+pI4nO/bI9t7P3OR+1XpqGyoj64W+TAPUwAhqNQclkgg3nMZh77KCLB5sF++IhVGAOPzyGgk5CyzXNL4OL/nF02i/QC2wJV/rI8wzA7IeaFXttIm1NIvTJSHDUYR8t/bwQt06zE2ek+x7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rTw7YcUwtwnNHw20T4cyNNzddsGs5o3sKWz7vHE7smk=; b=oBc/eM2ZVFNtm35tdkwbmAtA1XQQyTOh1BtMh38dZJRtS5YYdJGi/RNtggTlEm2d4hNq7ZzgEd2GijQQx1Vjq9SSdwQG21oKsmmQ/ZE8l85onxT6m97YvO0CeaAF/WWrWlgC7/Uuk3JIy4D11ygZ9SBTs7VP73Rkt0uoYuEI4Ic= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from AM9PR03MB7251.eurprd03.prod.outlook.com (20.182.235.144) by AM0PR03MB5812.eurprd03.prod.outlook.com (10.255.28.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20; Thu, 31 Dec 2020 22:49:27 +0000 Received: from AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::c800:6bd1:64e4:6644]) by AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::c800:6bd1:64e4:6644%7]) with mapi id 15.20.3700.031; Thu, 31 Dec 2020 22:49:27 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Simon Glass , Sean Anderson , Filip Brozovic , mingming lee Subject: [PATCH 7/9] fastboot: Move part_get_info_by_name_or_alias after raw_part_get_info_by_name Date: Thu, 31 Dec 2020 17:48:50 -0500 Message-Id: <20201231224853.1431364-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201231224853.1431364-1-sean.anderson@seco.com> References: <20201231224853.1431364-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BLAPR03CA0128.namprd03.prod.outlook.com (2603:10b6:208:32e::13) To AM9PR03MB7251.eurprd03.prod.outlook.com (2603:10a6:20b:26e::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BLAPR03CA0128.namprd03.prod.outlook.com (2603:10b6:208:32e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20 via Frontend Transport; Thu, 31 Dec 2020 22:49:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b35fe49-bcce-4909-a2e2-08d8adde53d2 X-MS-TrafficTypeDiagnostic: AM0PR03MB5812: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:346; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IuCpFdxCQLIGV5/ONM0MNXuBoXNsJ83sdHzwI4b7vFzOzDDhcvUzPtSLQItNu5RQU2z8DAcpS6U2uaPKhT9WbjsXjdHRmNFbU3cLCwDg1HEt4z6Gl08QtYGa5zQP37xvhvotlI5peNXM4wsGU/NDHHibdMqnAQmhDsHM477Clc1XwhoXMLjrzqKJME91rG5fORwB63/DLu9xrqNGfRb8By6UXtHHaqMOt7zqUVmv2JOAJn0T0mW6N95jJTL8/Yhj1rywokaWd72yRC0nP3OGH625ahh0FMGSBmU8KSRrjLGKliXd8/j0m0AsJlvEBycUDGUgltX9LFDUHVin0rXtb9+nc/iz7e+HTy7u/33SPyXCMU+zPga4k47Ih2bcrd3ZgK/6/hm94K/KOZdEoDCK+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR03MB7251.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(39840400004)(136003)(396003)(376002)(366004)(346002)(36756003)(66476007)(66556008)(956004)(26005)(52116002)(8936002)(44832011)(316002)(54906003)(478600001)(2616005)(6486002)(16526019)(1076003)(4326008)(186003)(5660300002)(6916009)(6512007)(2906002)(6506007)(66946007)(8676002)(86362001)(83380400001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: yXbAYroh0LjGfxs9od60YMTz9bfPYLEph3tobIB7QzVd68XLMG/yGSOEMilJtYoT9tyjiFXMCW8J2UAhGCD7G97VUxgYlhRfsl/yKMbPYYfuX5g55GrpYsGNHEe7kznOYe33/xxYkQZgv+g6rIkRvQ3ojjdOzCvK4OLLdDN26C8Za0xwHLoCDDIc8+rXzjX0tgpl5Z8vQP/CwC/u6i7cZZ5cxTRsSYJo3sKfWJpx0naFqpdHei1bfeJC82pLJUx5HZDbZAcQ0C8xJY0mHGYk/EN+10x1uM2UFF5Mcl8WnP/XJQlRcm3/Xjo5DTD7IDsU1+IuCpkHbPndvbt3va4+0PYnH0v2cN/Yy1lBsNHLAc9PRh6B/wG4S+QNwYcmdIrexkflP7xGW43uTxAIdfn+3xhRtDZIc5K5k5jFIbDzi4UEoDxIJgvMgmTxRZe/yA4+VBg3iQIvhSsMGRlwb3pxTF3LxrcxVaYrqx0M0ZE1gy48ldPKdizgbiq2ROtOrLT6ngFczHyFxwTKEiF3+mH+5KWP3azMwdouzyjdIxGipXd4HTSnXf5XRJEiEowPkCuw2odH434V8b0keFArfGJF6ivxlg3Ed441++lxJozcIGSrA8DrNvQXhMse7SqSdPc9m9B5kNBgflh1edG9BFUNP7Ds/YKij5Os0SnGnIptDFcYfzX4VDF4K5nB4kuNWkteOxz0ImQMwB/PhxTXj90N+CYiX0hEugyDzgvOfl/DWOM0o3fmm8EIjXqrY67DuZgl+ATVspbH5wlAvVq7G5T+D/u4eTpUJavzaE3EyH6LtQzAF6T/SuM9rHtmjv4ofGSE5RRE49a0BqviJmkPeU5KsJ0cy7RhzZGurfwuAxdzrRAP/7RlndsSKxn/eH0wnpuNI3CKUguqiE/zUtk4kaEaCe8+QGM982DUEL+ydFa7mQ+DszB222J0ed3na9xKZKQmDxAVrGPTcv/+6KNxMDfQLLAeZrlCC1zi9w1P33syRZ75KhclMfCkvkjva2aXjGfp X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB7251.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2020 22:49:27.2348 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-Network-Message-Id: 2b35fe49-bcce-4909-a2e2-08d8adde53d2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4e4dK6C6cH8juQWEaE8465UHd1hv1dfFGa+uu9XVmUJ7qYjKlLpiledhCRMo/aalunTOf4mr78ID6+qNGkqo4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB5812 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 This makes the next commit more readable by doing the move now. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- drivers/fastboot/fb_mmc.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index f6cacd711b..b0610d3151 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -28,28 +28,6 @@ struct fb_mmc_sparse { struct blk_desc *dev_desc; }; -static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, - const char *name, struct disk_partition *info) -{ - int ret; - - ret = part_get_info_by_name(dev_desc, name, info); - if (ret < 0) { - /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ - char env_alias_name[25 + PART_NAME_LEN + 1]; - char *aliased_part_name; - - /* check for alias */ - strcpy(env_alias_name, "fastboot_partition_alias_"); - strncat(env_alias_name, name, PART_NAME_LEN); - aliased_part_name = env_get(env_alias_name); - if (aliased_part_name != NULL) - ret = part_get_info_by_name(dev_desc, - aliased_part_name, info); - } - return ret; -} - static int raw_part_get_info_by_name(struct blk_desc *dev_desc, const char *name, struct disk_partition *info) @@ -98,6 +76,28 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, return 0; } +static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, + const char *name, struct disk_partition *info) +{ + int ret; + + ret = part_get_info_by_name(dev_desc, name, info); + if (ret < 0) { + /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ + char env_alias_name[25 + PART_NAME_LEN + 1]; + char *aliased_part_name; + + /* check for alias */ + strcpy(env_alias_name, "fastboot_partition_alias_"); + strncat(env_alias_name, name, PART_NAME_LEN); + aliased_part_name = env_get(env_alias_name); + if (aliased_part_name != NULL) + ret = part_get_info_by_name(dev_desc, + aliased_part_name, info); + } + return ret; +} + /** * fb_mmc_blk_write() - Write/erase MMC in chunks of FASTBOOT_MAX_BLK_WRITE *