From patchwork Mon Mar 29 00:27:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11751 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DEBD2C32EE for ; Mon, 29 Mar 2021 00:27:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9D02168788; Mon, 29 Mar 2021 02:27:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CoOYxXVV"; dkim-atps=neutral Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 14783602D7 for ; Mon, 29 Mar 2021 02:27:26 +0200 (CEST) Received: by mail-pj1-x1032.google.com with SMTP id kk2-20020a17090b4a02b02900c777aa746fso5091397pjb.3 for ; Sun, 28 Mar 2021 17:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IPfuHldJe8ZsSTLGeouvJnaaAIQJGOTMnvYwGW9M4iY=; b=CoOYxXVV0mobvWfZbzAY6zJVfYBTGf/mq8aITnEflWL5gXBESksi6IwFYz1D0PvW72 +sL0MCHqG0uUNs/xWiMde0cDjzAMqH85XVTuHGY1zGw+vI9RJas07YCRHGHdoPkALiul Pdyg2P3sZLYqi8WurxGR4auipoOGA2nS5VMqs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPfuHldJe8ZsSTLGeouvJnaaAIQJGOTMnvYwGW9M4iY=; b=Yzu0W20TfNv2YHJnc+6hzBshzljieCVbRFGcxT7v7Cq5qHl1XHDB2HlxEsfvcbFI3u sGoGwZCzQsKjvV8AVqi7vKUIl9bVL6AKsHT56U2F35PkGzSRIZvlfNiTCTLoMaJJDF22 CMm+dP2IHsqyw0p2Xfn6JY8VfUd4yF+UhUgsiiAWgn9lIfAD1NAQIlIVaSFJfBEP/rJU Dj+84PHAcDIXOYmALGNEZAiJWKXyPVGU1WsYClso9EgJRL/uePZJwGL1odmMOMoD99at q46j66R6T/WaG4CQsdhuMcqYNpBqOwLxbuDItkBi2auN3NSD6PNoIM+SpBVvARWpLQm0 RRuw== X-Gm-Message-State: AOAM533DY1G5KP2b97m3nOR93GyeQb0yBEXNtGz8ahbw1kxvyjMkyE1I zxMAspAm4ik7QFAua+/AZa0h8ba2I5pS6g== X-Google-Smtp-Source: ABdhPJyvtzSu7p3YduSl9MVA4mZsFQ9ubVwTJL1bF9nj4wqJ4RJZzkBEYT1oNI9fJN1zOFvjKw1yoA== X-Received: by 2002:a17:902:c408:b029:e7:3242:5690 with SMTP id k8-20020a170902c408b02900e732425690mr14074350plk.85.1616977644576; Sun, 28 Mar 2021 17:27:24 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:1db7:ae60:9288:b906]) by smtp.gmail.com with ESMTPSA id j188sm15227209pfd.64.2021.03.28.17.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 17:27:24 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 29 Mar 2021 09:27:13 +0900 Message-Id: <20210329002715.74403-2-hiroh@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210329002715.74403-1-hiroh@chromium.org> References: <20210329002715.74403-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: PipelineHandler: Make queueRequest() void function X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" PipelineHandler::queueRequest() is asynchronously invoked in Camera::queueRequest(). Therefore the return value of PipelineHandler::queueRequest() is useless. This changes the function to a void function. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart --- include/libcamera/internal/pipeline_handler.h | 2 +- src/libcamera/camera.cpp | 6 ++++-- src/libcamera/pipeline_handler.cpp | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 6aca0b46..093b94c6 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -79,7 +79,7 @@ public: virtual int start(Camera *camera, const ControlList *controls) = 0; virtual void stop(Camera *camera) = 0; - int queueRequest(Request *request); + void queueRequest(Request *request); bool completeBuffer(Request *request, FrameBuffer *buffer); void completeRequest(Request *request); diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 84edbb8f..2611c701 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -996,8 +996,10 @@ int Camera::queueRequest(Request *request) } } - return d->pipe_->invokeMethod(&PipelineHandler::queueRequest, - ConnectionTypeQueued, request); + d->pipe_->invokeMethod(&PipelineHandler::queueRequest, + ConnectionTypeQueued, request); + + return 0; } /** diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index d22991d3..05b807d6 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -374,7 +374,7 @@ const ControlList &PipelineHandler::properties(const Camera *camera) const * * \return 0 on success or a negative error code otherwise */ -int PipelineHandler::queueRequest(Request *request) +void PipelineHandler::queueRequest(Request *request) { LIBCAMERA_TRACEPOINT(request_queue, request); @@ -385,8 +385,6 @@ int PipelineHandler::queueRequest(Request *request) int ret = queueRequestDevice(camera, request); if (ret) data->queuedRequests_.remove(request); - - return ret; } /**