[libcamera-devel] [PATCH v2 2/2] libcamera: pipeline_handler: Remove Camera pointer from CameraData

[Jacopo Mondi]

Hi Niklas,

On Tue, Dec 22, 2020 at 12:53:45AM +0100, Niklas Söderlund wrote:
> There are no users left of this field, drop it.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>

Thanks
  j

> ---
>  include/libcamera/internal/pipeline_handler.h |  1 -
>  src/libcamera/pipeline_handler.cpp            | 11 -----------
>  2 files changed, 12 deletions(-)
>
> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
> index 5f9a26be1f7a9e9e..0748f86346084e2d 100644
> --- a/include/libcamera/internal/pipeline_handler.h
> +++ b/include/libcamera/internal/pipeline_handler.h
> @@ -42,7 +42,6 @@ public:
>  	}
>  	virtual ~CameraData() = default;
>
> -	Camera *camera_;
>  	PipelineHandler *pipe_;
>  	std::list<Request *> queuedRequests_;
>  	ControlInfoMap controlInfo_;
> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> index 26d6c07d2d6e69e9..c2604d4561124186 100644
> --- a/src/libcamera/pipeline_handler.cpp
> +++ b/src/libcamera/pipeline_handler.cpp
> @@ -60,16 +60,6 @@ LOG_DEFINE_CATEGORY(Pipeline)
>   * exists.
>   */
>
> -/**
> - * \var CameraData::camera_
> - * \brief The camera related to this CameraData instance
> - *
> - * The camera_ pointer provides access to the Camera object that this instance
> - * is related to. It is set when the Camera is registered with
> - * PipelineHandler::registerCamera() and remains valid until the CameraData
> - * instance is destroyed.
> - */
> -
>  /**
>   * \var CameraData::pipe_
>   * \brief The pipeline handler related to this CameraData instance
> @@ -493,7 +483,6 @@ void PipelineHandler::completeRequest(Request *request)
>  void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera,
>  				     std::unique_ptr<CameraData> data)
>  {
> -	data->camera_ = camera.get();
>  	cameraData_[camera.get()] = std::move(data);
>  	cameras_.push_back(camera);
>
> --
> 2.29.2
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel