From e04bd18589fb04e5fc3974e79f8ae33d22a159df Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Tue, 20 Oct 2020 18:15:03 +0900 Subject: libcamera: Omit extra semicolons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The end semicolons with LOG_DEFINE_CATEGORY, LOG_DECLARE_CATEGORY and REGISTER_PIPELINE_HANDLER are unnecessary. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham Signed-off-by: Laurent Pinchart --- Documentation/guides/pipeline-handler.rst | 4 ++-- src/libcamera/byte_stream_buffer.cpp | 2 +- src/libcamera/camera_sensor.cpp | 2 +- src/libcamera/file.cpp | 2 +- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++-- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +- src/libcamera/pipeline/simple/converter.cpp | 2 +- src/libcamera/pipeline/simple/simple.cpp | 2 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +- src/libcamera/pipeline/vimc/vimc.cpp | 2 +- src/libcamera/sysfs.cpp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Documentation/guides/pipeline-handler.rst b/Documentation/guides/pipeline-handler.rst index 71ef2050..d0370f16 100644 --- a/Documentation/guides/pipeline-handler.rst +++ b/Documentation/guides/pipeline-handler.rst @@ -258,7 +258,7 @@ methods for the overridden class members. return false; } - REGISTER_PIPELINE_HANDLER(PipelineHandlerVivid); + REGISTER_PIPELINE_HANDLER(PipelineHandlerVivid) } /* namespace libcamera */ @@ -1470,4 +1470,4 @@ application which will render the frames in a window for visual inspection: .. TODO: Running qcam with the vivid pipeline handler appears to have a bug and no visual frames are seen. However disabling zero-copy on qcam renders - them successfully. \ No newline at end of file + them successfully. diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp index df7029b0..7db5501d 100644 --- a/src/libcamera/byte_stream_buffer.cpp +++ b/src/libcamera/byte_stream_buffer.cpp @@ -14,7 +14,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(Serialization); +LOG_DEFINE_CATEGORY(Serialization) /** * \file byte_stream_buffer.h diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 78c7ceec..935de528 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -28,7 +28,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(CameraSensor); +LOG_DEFINE_CATEGORY(CameraSensor) /** * \struct CameraSensorInfo diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index 04b0cb61..3a3f5bb6 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -23,7 +23,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(File); +LOG_DEFINE_CATEGORY(File) /** * \class File diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index f5a20d30..af47739d 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -66,7 +66,7 @@ public: Status validate() override; - const StreamConfiguration &cio2Format() const { return cio2Configuration_; }; + const StreamConfiguration &cio2Format() const { return cio2Configuration_; } const ImgUDevice::PipeConfig imguConfig() const { return pipeConfig_; } private: @@ -866,6 +866,6 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer) imgu_->input_->queueBuffer(buffer); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3); +REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 26dbd257..331ada7a 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1675,6 +1675,6 @@ FrameBuffer *RPiCameraData::updateQueue(std::queue &q, uint64_t t return nullptr; } -REGISTER_PIPELINE_HANDLER(PipelineHandlerRPi); +REGISTER_PIPELINE_HANDLER(PipelineHandlerRPi) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp index 0572acc9..62605c0f 100644 --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp @@ -17,7 +17,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(RPI_S_W); +LOG_DEFINE_CATEGORY(RPI_S_W) namespace RPi { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index aec590ff..2352ab3b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -1184,6 +1184,6 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer) data->ipa_->processEvent(op); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1); +REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 75fb297e..b4ee021f 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -21,7 +21,7 @@ namespace libcamera { -LOG_DECLARE_CATEGORY(SimplePipeline); +LOG_DECLARE_CATEGORY(SimplePipeline) SimpleConverter::SimpleConverter(MediaDevice *media) : m2m_(nullptr) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 7adb17e2..8c00c0ff 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -942,6 +942,6 @@ void SimplePipelineHandler::converterDone(FrameBuffer *input, data->video_->queueBuffer(input); } -REGISTER_PIPELINE_HANDLER(SimplePipelineHandler); +REGISTER_PIPELINE_HANDLER(SimplePipelineHandler) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 8ec0dac1..a903a823 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -654,6 +654,6 @@ void UVCCameraData::bufferReady(FrameBuffer *buffer) pipe_->completeRequest(camera_, request); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC); +REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index fc8085f1..7416c37c 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -533,6 +533,6 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer) pipe_->completeRequest(camera_, request); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc); +REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc) } /* namespace libcamera */ diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp index 6c8e9554..3ebe66f8 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -22,7 +22,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(SysFs); +LOG_DEFINE_CATEGORY(SysFs) namespace sysfs { -- cgit v1.2.1