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, 2 insertions, 16 deletions

diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp
index dbc43df8..9cf59185 100644
--- a/test/controls/control_info.cpp
+++ b/test/controls/control_info.cpp
@@ -24,14 +24,7 @@ protected:
 		 * Test information retrieval from a control with no minimum
 		 * and maximum.
 		 */
-		ControlInfo brightness(controls::Brightness);
-
-		if (brightness.id() != controls::Brightness ||
-		    brightness.id().type() != ControlTypeInteger32 ||
-		    brightness.id().name() != std::string("Brightness")) {
-			cout << "Invalid control identification for Brightness" << endl;
-			return TestFail;
-		}
+		ControlInfo brightness;
 
 		if (brightness.min().get<int32_t>() != 0 ||
 		    brightness.max().get<int32_t>() != 0) {
@@ -43,14 +36,7 @@ protected:
 		 * Test information retrieval from a control with a minimum and
 		 * a maximum value.
 		 */
-		ControlInfo contrast(controls::Contrast, 10, 200);
-
-		if (contrast.id() != controls::Contrast ||
-		    contrast.id().type() != ControlTypeInteger32 ||
-		    contrast.id().name() != std::string("Contrast")) {
-			cout << "Invalid control identification for Contrast" << endl;
-			return TestFail;
-		}
+		ControlInfo contrast(10, 200);
 
 		if (contrast.min().get<int32_t>() != 10 ||
 		    contrast.max().get<int32_t>() != 200) {