From patchwork Thu Jul 13 20:51:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 787983 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x7p2p6NTzz9s81 for ; Fri, 14 Jul 2017 06:54:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 81747C21EE0; Thu, 13 Jul 2017 20:52:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5D6B7C21EC2; Thu, 13 Jul 2017 20:51:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D3409C21E16; Thu, 13 Jul 2017 20:51:42 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id EBCC8C21E14 for ; Thu, 13 Jul 2017 20:51:41 +0000 (UTC) Received: from localhost.localdomain ([88.152.145.149]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MQQzk-1d6Pdw3hvA-00TpRy; Thu, 13 Jul 2017 22:51:40 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Thu, 13 Jul 2017 22:51:31 +0200 Message-Id: <20170713205135.1538-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170713205135.1538-1-xypron.glpk@gmx.de> References: <20170713205135.1538-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:adlc9lpo14XVTOyl2RX1T8JYmuVtOUT05ewqSGotj1Iee5qTyQ4 fDwxMdMtZwWR5GO7Rcum+yrc3WcEtzKp9nk5j797I1yzLu7aEfnP++au87jo7pa7XvgJwZE sxxSV1IlVLNm1uxWikEW02aXYAwCox0/3U7R/2oIZsNny6BBXmr9zFSnvC5pSUbcqWE2Xzu v6xjoSfE9/d576b0UY0yg== X-UI-Out-Filterresults: notjunk:1; V01:K0:sAcdG0IbdLM=:8JW21biHJtwQ3AjcjARlfO b21KUjltJYK0D0i6istQRHO2AddEIwVViLXQnGa5+zjZ3mDYhB3fr137DoajBn9ZroN+tGunT 6JH2mqJQVGjEjDqDCSUwKx0ErIreU9FGVKwKgSbW3Nz+2nvQz4Dv/En3z8pmJzj9Akq2Vsq0S yxzwMgRbVczzMHL90HlPWDFMLsKseEIL75pRPS5ngFWexcnEF1TmCQd0PgOfks41Q4nZYfQiB 6JX92AyGBhqsnSK8HW/s/fAYjs6Gs7KivAfO0BqkY9QoCcynSIM6I/bF9R3LfeDJjYELK04Tn GA+UzrME83F7BtlxhqTV7q7mwGykydrdAKXpdtQpnnX5W6+e5sRBQhCTPjZpKCfy97M2IWd4/ soc1nzO7sl2f2tCp8A4K7Ke/Ab6gi2sHmYB+ZemSwPUXqVhK5nMDmPIRN02Eu01NfrTTHv1Jy u7HpAtSVIco+54YbWNCj3p/aq1wtzzvjHDhuHcxF2b0J1VGiljq0eV432w7TkXUwXoMPrlcJw DGDjtZsaNEhdDrbmzHAxxBnt9XZABc71mv2HwGQ1etTD1C5rqJ0qkbKUD453AQwKd3VAPvJfK BeikBjBUoez08haXA3H3lO73NE/h3tAuhaXBl7QhTrEldsNKRiAiXAAM3xD2kt/Ff/cDDZ42B 92jgaOnzxfSPVISZHZqa1ciT1/8THVkV2eL9KN4IIAElvdUA+50AZKbeMpM4LmWNYvVprcvy5 aE8NkHDEbdN0QJ5mZHp0fvAnkUEg4h+ZdnnC3R9CNsMiC5ejtjjpjwyxfynbYqAOdyXx+lZlk ttp8RSvR6HimF44ebD91Bw4Nbareg== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH v2 1/5] efi_loader: do not duplicate constants for device path X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We should not duplicate existing constants used by the device path protocol. Signed-off-by: Heinrich Schuchardt --- v2 no change --- lib/efi_loader/efi_device_path_to_text.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index a7a513047f..3a92247f30 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -9,9 +9,6 @@ #include #include -#define MEDIA_DEVICE_PATH 4 -#define FILE_PATH_MEDIA_DEVICE_PATH 4 - const efi_guid_t efi_guid_device_path_to_text_protocol = EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID; @@ -38,9 +35,9 @@ uint16_t *efi_convert_device_path_to_text( uint16_t *buffer = NULL; switch (device_path->type) { - case MEDIA_DEVICE_PATH: + case DEVICE_PATH_TYPE_MEDIA_DEVICE: switch (device_path->sub_type) { - case FILE_PATH_MEDIA_DEVICE_PATH: + case DEVICE_PATH_SUB_TYPE_FILE_PATH: buffer_size = device_path->length - 4; r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, buffer_size, (void **) &buffer);