libcamera: controls: Remove ControlInfo::id

The ControlInfo id member is only used in the toString() method of the
class, and nowhere else externally. The same way that ControlValue
doesn't store a ControlId, ControlInfo shouldn't. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

1 files changed, 3 insertions, 10 deletions

diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index 5e8b3a9b..526b7755 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -323,23 +323,16 @@ Control<int64_t>::Control(unsigned int id, const char *name)
 
 /**
  * \brief Construct a ControlInfo with minimum and maximum range parameters
- * \param[in] id The control ID
  * \param[in] min The control minimum value
  * \param[in] max The control maximum value
  */
-ControlInfo::ControlInfo(const ControlId &id, const ControlValue &min,
+ControlInfo::ControlInfo(const ControlValue &min,
 			 const ControlValue &max)
-	: id_(id), min_(min), max_(max)
+	: min_(min), max_(max)
 {
 }
 
 /**
- * \fn ControlInfo::id()
- * \brief Retrieve the control ID
- * \return The control ID
- */
-
-/**
  * \fn ControlInfo::min()
  * \brief Retrieve the minimum value of the control
  * \return A ControlValue with the minimum value for the control
@@ -358,7 +351,7 @@ std::string ControlInfo::toString() const
 {
 	std::stringstream ss;
 
-	ss << id_.name() << "[" << min_.toString() << ".." << max_.toString() << "]";
+	ss << "[" << min_.toString() << ".." << max_.toString() << "]";
 
 	return ss.str();
 }