[RFC PATCH v1 2/8] utils: codegen: ipc: Remove `namespace` argument

[Barnabás Pőcze]

The `serializer()`, `deserializer_{fd,no_fd,simple}()` functions
take a string argument named "namespace", but they do not use it.
So remove the argument.

Signed-off-by: Barnabás Pőcze <barnabas.pocze at ideasonboard.com>
---
 .../core_ipa_serializer.h.tmpl                 |  8 ++++----
 .../module_ipa_serializer.h.tmpl               |  8 ++++----
 .../libcamera_templates/serializer.tmpl        | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
index 036518f6c..cbb35ef51 100644
--- a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
+++ b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
@@ -31,12 +31,12 @@ template<>
 class IPADataSerializer<{{struct|name}}>
 {
 public:
-{{- serializer.serializer(struct, "")}}
+{{- serializer.serializer(struct)}}
 {%- if struct|has_fd %}
-{{serializer.deserializer_fd(struct, "")}}
+{{serializer.deserializer_fd(struct)}}
 {%- else %}
-{{serializer.deserializer_no_fd(struct, "")}}
-{{serializer.deserializer_fd_simple(struct, "")}}
+{{serializer.deserializer_no_fd(struct)}}
+{{serializer.deserializer_fd_simple(struct)}}
 {%- endif %}
 };
 {% endfor %}
diff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
index cd5a65a92..f3b8e3b15 100644
--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
@@ -32,12 +32,12 @@ template<>
 class IPADataSerializer<{{struct|name_full}}>
 {
 public:
-{{- serializer.serializer(struct, namespace_str)}}
+{{- serializer.serializer(struct)}}
 {%- if struct|has_fd %}
-{{serializer.deserializer_fd(struct, namespace_str)}}
+{{serializer.deserializer_fd(struct)}}
 {%- else %}
-{{serializer.deserializer_no_fd(struct, namespace_str)}}
-{{serializer.deserializer_fd_simple(struct, namespace_str)}}
+{{serializer.deserializer_no_fd(struct)}}
+{{serializer.deserializer_fd_simple(struct)}}
 {%- endif %}
 };
 {% endfor %}
diff --git a/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl b/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl
index 323e12939..114e349c9 100644
--- a/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl
+++ b/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl
@@ -28,7 +28,7 @@
  #
  # \todo Avoid intermediate vectors
  #}
-{%- macro serializer_field(field, namespace, loop) %}
+{%- macro serializer_field(field, loop) %}
 {%- if field|is_pod or field|is_enum %}
 		std::vector<uint8_t> {{field.mojom_name}};
 		std::tie({{field.mojom_name}}, std::ignore) =
@@ -94,7 +94,7 @@
  # Generate code to deserialize \a field into object ret.
  # This code is meant to be used by the IPADataSerializer specialization.
  #}
-{%- macro deserializer_field(field, namespace, loop) %}
+{%- macro deserializer_field(field, loop) %}
 {% if field|is_pod or field|is_enum %}
 	{%- set field_size = (field|bit_width|int / 8)|int %}
 		{{- check_data_size(field_size, 'dataSize', field.mojom_name, 'data')}}
@@ -182,7 +182,7 @@
  # Generate code for IPADataSerializer specialization, for serializing
  # \a struct.
  #}
-{%- macro serializer(struct, namespace) %}
+{%- macro serializer(struct) %}
 	static std::tuple<std::vector<uint8_t>, std::vector<SharedFD>>
 	serialize(const {{struct|name_full}} &data,
 {%- if struct|needs_control_serializer %}
@@ -196,7 +196,7 @@
 		std::vector<SharedFD> retFds;
 {%- endif %}
 {%- for field in struct.fields %}
-{{serializer_field(field, namespace, loop)}}
+{{serializer_field(field, loop)}}
 {%- endfor %}
 {% if struct|has_fd %}
 		return {retData, retFds};
@@ -213,7 +213,7 @@
  # Generate code for IPADataSerializer specialization, for deserializing
  # \a struct, in the case that \a struct has file descriptors.
  #}
-{%- macro deserializer_fd(struct, namespace) %}
+{%- macro deserializer_fd(struct) %}
 	static {{struct|name_full}}
 	deserialize(std::vector<uint8_t> &data,
 		    std::vector<SharedFD> &fds,
@@ -245,7 +245,7 @@
 		size_t dataSize = std::distance(dataBegin, dataEnd);
 		[[maybe_unused]] size_t fdsSize = std::distance(fdsBegin, fdsEnd);
 {%- for field in struct.fields -%}
-{{deserializer_field(field, namespace, loop)}}
+{{deserializer_field(field, loop)}}
 {%- endfor %}
 		return ret;
 	}
@@ -258,7 +258,7 @@
  # \a struct, in the case that \a struct has no file descriptors but requires
  # deserializers with file descriptors.
  #}
-{%- macro deserializer_fd_simple(struct, namespace) %}
+{%- macro deserializer_fd_simple(struct) %}
 	static {{struct|name_full}}
 	deserialize(std::vector<uint8_t> &data,
 		    [[maybe_unused]] std::vector<SharedFD> &fds,
@@ -285,7 +285,7 @@
  # Generate code for IPADataSerializer specialization, for deserializing
  # \a struct, in the case that \a struct does not have file descriptors.
  #}
-{%- macro deserializer_no_fd(struct, namespace) %}
+{%- macro deserializer_no_fd(struct) %}
 	static {{struct|name_full}}
 	deserialize(std::vector<uint8_t> &data,
 {%- if struct|needs_control_serializer %}
@@ -312,7 +312,7 @@
 
 		size_t dataSize = std::distance(dataBegin, dataEnd);
 {%- for field in struct.fields -%}
-{{deserializer_field(field, namespace, loop)}}
+{{deserializer_field(field, loop)}}
 {%- endfor %}
 		return ret;
 	}
-- 
2.49.0