[PATCH 1/1] efi_loader: move struct efi_device_path to efi.h

[PATCH 1/1] efi_loader: move struct efi_device_path to efi.h

[Heinrich Schuchardt]

Avoid forward declaration of struct efi_device_path.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 include/efi.h     | 13 ++++++++++++-
 include/efi_api.h |  6 ------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/efi.h b/include/efi.h
index c3087d3da2..2f312da3cb 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -52,7 +52,18 @@
 #define EFI32_LOADER_SIGNATURE	"EL32"
 #define EFI64_LOADER_SIGNATURE	"EL64"
 
-struct efi_device_path;
+/**
+ * struct efi_device_path - device path protocol
+ *
+ * @type:	device path type
+ * @sub_type:	device path sub-type
+ * @length:	length of the device path node including the header
+ */
+struct efi_device_path {
+	u8 type;
+	u8 sub_type;
+	u16 length;
+} __packed;
 
 /*
  * The EFI spec defines the EFI_GUID as
diff --git a/include/efi_api.h b/include/efi_api.h
index 2d18d25a71..2969884280 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -557,12 +557,6 @@ struct efi_loaded_image {
 #  define DEVICE_PATH_SUB_TYPE_INSTANCE_END	0x01
 #  define DEVICE_PATH_SUB_TYPE_END		0xff
 
-struct efi_device_path {
-	u8 type;
-	u8 sub_type;
-	u16 length;
-} __packed;
-
 struct efi_mac_addr {
 	u8 addr[32];
 } __packed;
-- 
2.39.2

Re: [PATCH 1/1] efi_loader: move struct efi_device_path to efi.h

[Simon Glass]

On Sun, 19 Mar 2023 at 20:59, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> Avoid forward declaration of struct efi_device_path.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
>  include/efi.h     | 13 ++++++++++++-
>  include/efi_api.h |  6 ------
>  2 files changed, 12 insertions(+), 7 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Missing motivation for patch.

Re: [PATCH 1/1] efi_loader: move struct efi_device_path to efi.h

[Ilias Apalodimas]

Hi Heinrich,

On Sun, Mar 19, 2023 at 08:59:33AM +0100, Heinrich Schuchardt wrote:
> Avoid forward declaration of struct efi_device_path.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
>  include/efi.h     | 13 ++++++++++++-
>  include/efi_api.h |  6 ------
>  2 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/include/efi.h b/include/efi.h
> index c3087d3da2..2f312da3cb 100644
> --- a/include/efi.h
> +++ b/include/efi.h
> @@ -52,7 +52,18 @@
>  #define EFI32_LOADER_SIGNATURE	"EL32"
>  #define EFI64_LOADER_SIGNATURE	"EL64"
>
> -struct efi_device_path;
> +/**
> + * struct efi_device_path - device path protocol
> + *
> + * @type:	device path type
> + * @sub_type:	device path sub-type
> + * @length:	length of the device path node including the header
> + */
> +struct efi_device_path {
> +	u8 type;
> +	u8 sub_type;
> +	u16 length;
> +} __packed;
>
>  /*
>   * The EFI spec defines the EFI_GUID as
> diff --git a/include/efi_api.h b/include/efi_api.h
> index 2d18d25a71..2969884280 100644
> --- a/include/efi_api.h
> +++ b/include/efi_api.h
> @@ -557,12 +557,6 @@ struct efi_loaded_image {
>  #  define DEVICE_PATH_SUB_TYPE_INSTANCE_END	0x01
>  #  define DEVICE_PATH_SUB_TYPE_END		0xff
>
> -struct efi_device_path {
> -	u8 type;
> -	u8 sub_type;
> -	u16 length;
> -} __packed;
> -
>  struct efi_mac_addr {
>  	u8 addr[32];
>  } __packed;
> --
> 2.39.2
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>