libcamera: v4l2_subdevice: Add method to retrieve the media entity

Add a method to retrieve the media entity associated with a subdevice.
The entityName() and deviceNode() methods are not needed anymore as they
can be accessed through the media entity, remove them.

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

1 files changed, 7 insertions, 15 deletions

diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
index a03fadfd..5d5b168f 100644
--- a/src/libcamera/v4l2_subdevice.cpp
+++ b/src/libcamera/v4l2_subdevice.cpp
@@ -131,12 +131,12 @@ int V4L2Subdevice::open()
 		return -EBUSY;
 	}
 
-	ret = ::open(deviceNode().c_str(), O_RDWR);
+	ret = ::open(entity_->deviceNode().c_str(), O_RDWR);
 	if (ret < 0) {
 		ret = -errno;
 		LOG(V4L2Subdev, Error)
-			<< "Failed to open V4L2 subdevice '" << deviceNode()
-			<< "': " << strerror(-ret);
+			<< "Failed to open V4L2 subdevice '"
+			<< entity_->deviceNode() << "': " << strerror(-ret);
 		return ret;
 	}
 	fd_ = ret;
@@ -166,17 +166,9 @@ void V4L2Subdevice::close()
 }
 
 /**
- * \fn V4L2Subdevice::deviceNode()
- * \brief Retrieve the path of the device node associated with the subdevice
- *
- * \return The subdevice's device node system path
- */
-
-/**
- * \fn V4L2Subdevice::entityName()
- * \brief Retrieve the name of the media entity associated with the subdevice
- *
- * \return The name of the media entity the subdevice is associated to
+ * \fn V4L2Subdevice::entity()
+ * \brief Retrieve the media entity associated with the subdevice
+ * \return The subdevice's associated media entity.
  */
 
 /**
@@ -343,7 +335,7 @@ V4L2Subdevice *V4L2Subdevice::fromEntityName(const MediaDevice *media,
 
 std::string V4L2Subdevice::logPrefix() const
 {
-	return "'" + entityName() + "'";
+	return "'" + entity_->name() + "'";
 }
 
 int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,