From patchwork Tue Feb 2 15:23:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434788 X-Patchwork-Delegate: lukma@denx.de 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; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=6OToaqnW; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DVTD212Gvz9vFD for ; Wed, 3 Feb 2021 02:25:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9FFFE82731; Tue, 2 Feb 2021 16:24:48 +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="6OToaqnW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D69082709; Tue, 2 Feb 2021 16:24: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=-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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60a]) (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 949D7826AE for ; Tue, 2 Feb 2021 16:24:31 +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=FoRwoZR/TheD9JKblo6x34F5KCCDoHV2jEKAw5Dcj6Wa4N4gX2dq9YG2FVhrNoeSaZ1I/fK+5E12wQmNmvpVKcle8pQ0aO8hwqYe8Z/WjkbGbxH3Uv6Usp272Lu1aFt2iBzjT+D8AGg+HaueJNSD1omeoVi4lN63Z3EJ08I4Ek+60fUJUp8vK+XA2tkW8kTco/pmM0Te1hgGaO5aozMUPJ4xUeuEWdk5Ukb9AG885QG+D+dlWoEkwUzQPz4svSauKLVci2bkinDd/aCEWWVUMRXP8bzDVMxPPD1M2+ZG+z4en8m0MAmxWhoK3e7+dOKEpkTHN5uM3vINgyKB3skxXg== 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=SHp9CX/Cj9DapOD1mO+QNwksc4LfaW3Xt930nFz6iSg=; b=ZQZ9YCKvKJNcsQZrKBmKPp9nKjiTrzFwDnhsiYYc0wb4YmQuLm4l5JVj3vDgfG6AqjdZpmw93RUQF6PiyEGKmRTL2MDoG86R3GsdzBK0Aa6PkbqCdgdE29Yqh0talbsBPzhhviM6k8tA4uoZgagxIZwktFNUjn5SuURPOxjRIJnlGj+Vj6vo66HCh9a8zhqPxUHmLcDMUlCuCytzi19TMdr5ZbouMN3FhSYaZ4SMgqf1Rg3j2Iz1y4L18MvyzZUnwyPcQDSmWlu9i60X2YBY7+1Cfe+YjTtLtiLtY2SipKR3RbknKZyuPRbbpGxA8oJ7nS/ZmizwZ1HVVnbwQmVKnQ== 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=SHp9CX/Cj9DapOD1mO+QNwksc4LfaW3Xt930nFz6iSg=; b=6OToaqnWnai9Z3uOkUUlxN8GQGUdn6t6TnOAHUCBwDd9U9JOaOpxkuF8hugpE9Lt5Y5TKVH+v3e8qUn46uHEngKnbJaWdzyl331Y/a6+WAeHYqsGO/Z+QMA3/FphsM3/OKgiK0IOq0MZo/GObeXkLSlDkCzn8EFzuR48MSrmICg= 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 (2603:10a6:20b:26e::16) by VI1PR0302MB2816.eurprd03.prod.outlook.com (2603:10a6:800:e4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.19; Tue, 2 Feb 2021 15:24:30 +0000 Received: from AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::a8f2:7dd:46e5:8526]) by AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::a8f2:7dd:46e5:8526%6]) with mapi id 15.20.3805.028; Tue, 2 Feb 2021 15:24:30 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Filip Brozovic , Marek Szyprowski , Patrick Delaunay , Roman Stratiienko Subject: [PATCH v4 7/9] fastboot: Move part_get_info_by_name_or_alias after raw_part_get_info_by_name Date: Tue, 2 Feb 2021 10:23:50 -0500 Message-Id: <20210202152352.33245-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210202152352.33245-1-sean.anderson@seco.com> References: <20210202152352.33245-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0432.namprd13.prod.outlook.com (2603:10b6:208:2c3::17) 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 BL1PR13CA0432.namprd13.prod.outlook.com (2603:10b6:208:2c3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.16 via Frontend Transport; Tue, 2 Feb 2021 15:24:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 585da8d3-5de6-4437-408c-08d8c78ea2e9 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: 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: n9Ix8i7nh5+ucNj8AV6lbtEqpiWN2vgSW9zm0gdL+5kXHIrmLjilDobDzwrwLY0rY/0wFRJ9+XbSgxmEukvtSwHOaKcTpGsqZeOHk82Bc7AfM5C23hDaMHkcJfkj7YzhutgR+QZocx43eMNkUnAkE3R0O+EtaChMjEg1uwfR9WMHtmFHtFS1I1KGnsbhIxIntEWR5TnRZ5A2H0BDwbAVG0ePU+8gzjcFrcYFo3s/c9yXdEiU2BsiDrhlrhQnMULzB5XODiN+P4qxNPfn7mLhJOSuogFDEERH+XEEIFlbEU9Uk3jIsblkKbanBglZdynu6JwigZ9f1wCDQQ9NELuVsGVOaqslYoozhcACEPMbHghSBm7qZKh2i/12CWV/RGsoLbJdWVjGcd9fLx9v6REcVIBUo1eMDi1AcCX0/pvarvhCel4202Xoh+WyEhxjQ75pmyxtMaU1krn7HV4zfUXY84OILLLqB7+U8orI0rorxPmuqo4d0mlVigGl9AoumAH5et3pPJQtRBlrsYujAG+fQQ== 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:(376002)(396003)(346002)(39850400004)(366004)(136003)(54906003)(6512007)(1076003)(6916009)(316002)(478600001)(66476007)(66556008)(6666004)(5660300002)(16526019)(66946007)(2616005)(83380400001)(6506007)(2906002)(6486002)(52116002)(186003)(44832011)(4326008)(956004)(36756003)(8676002)(8936002)(86362001)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Q3Ah1N0L8VgElatP5jfpzw9+ULmf9Cob8FiYb+iISKb8P/wKcrKcVXR1CIhxDM6GMk4NIOrEbnnQ/iJb4issNEusfFmUrHEk1BwvMBuZdyWtvayekEJ20cnjNlnPl+kHYjB2jZaEB4VVcybICbRbXv2ZPUj9Ua7UARY6PiqAvH0jVqlegNNVBpYe+SSisdhxMMu6D99Etkq1XSRcHBDmGZpp/3NHLQWCnOT9q2HHA0QPz5X0AwzJAhf02SbpZ6QXcC3SzoPQ323XeCb0INkZ0l8V08XBFKyuF8mYmPu4jbOjj5l0d1colk8ys6dbOEvxjAH2X8NnM1yxHfeC2jxoLab/da+fEoXyZ2Kpo8b0FxiIjBCyKzmQdot/XZWMrxsgTXAN1y0ixKAQVTBPAgm4h0nhMuM32S9A8o17LuUSvwYR2ObeYedpS0r+6eAfHlTGLSDQtfWlRjcSrXWqgq3jPS8JagDz50PEG6HNRz5ciPfJMwEztkLRdQS7BRig56uWBsbjEZYkX3qKJAS2Dt6kDsGw0NKKApQim/upfzMMmNGAJcmKea58pwzwPqBpSxg/4EncA3hnJmOdSqaA9bLNeUjlRNZiGRKhO1s5+5I6g8SvwRW1c5ue/kYvCq7yHz0kocei1clf4QykQKgZMhgjI9hEa3Dz8tNMDMQT3jlpoySenItb66+bE71eZplXObIaRrCPSxGvD0Fx0XtvsK9Y3BxDuJCgCw4NcX4IVItUbdoT+Iy02egnvCuEmcnyqsKxgzdlm14r8oDAnyKxIFgPkFtY7Kq95BxPO1ox6PNNXUMnTUQJh1uOonHNoEoK7lCW/QUCYeTOKdj/kwdRPeLPYQaqd6tosQ4rtoX2KwvAV8WugRpR5k3zOw+j9n0jYPc9ScfofkYkfkjg01si/41tEXJSpUO1qVMlt2Nf13Hr2yhoaULcN9GG3tFP5EknWaEr08egjTZUKt1laOABmEV0hyr5Y2Rr29WfHakCpXiZypbyCftEhFsbCUTfodd+DcSWuDcswMtoikqgeVjubQYNOaVrEZclpdqkS4nAurIVyhSLn6ezKa0iNyjWJwst/Dhg X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 585da8d3-5de6-4437-408c-08d8c78ea2e9 X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB7251.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2021 15:24:30.6489 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qRRR/PhKb9XCzUyQj4rCdKU1s4GHZGj5uqfJJwZPJfrXqjFTZGleM5kOjkS/p8oKKT/hwdOqvoCuWYnd0Gib+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0302MB2816 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 --- (no changes since v1) 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 75347bb99b..71eeb02c8f 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 *