[libcamera-devel] [PATCH v2 6/8] libcamera: Omit extra semicolons
Kieran Bingham
kieran.bingham at ideasonboard.com
Tue Oct 20 12:17:06 CEST 2020
Hi Laurent,
On 20/10/2020 11:12, Laurent Pinchart wrote:
> Hi Kieran,
>
> On Tue, Oct 20, 2020 at 11:05:31AM +0100, Kieran Bingham wrote:
>> On 20/10/2020 10:15, Hirokazu Honda wrote:
>>> The end semicolons with LOG_DEFINE_CATEGORY,
>>> LOG_DECLARE_CATEGORY and REGISTER_PIPELINE_HANDLER are
>>> unnecessary.
>>>
>>> Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
>>> ---
>>> 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 71ef205..d0370f1 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.
>>
>> The file ending has been changed here.
>>
>> When adding your changes, consider using 'git add -p' to add changes one
>> hunk at a time. That gives you chance to review them as they go into the
>> staging/cache before you commit too.
>>
>> This can either be ignored or fixed up when applying - either way.
>
> I'll leave it in, as it's just the newline character and not a blank
> line. vim doesn't make it easy to remove it, I think it's actually a
> good idea to have it in (or maybe sometime will tell me I should use
> emacs instead ;-)).
>
I actually mis-interpreted it on first read. I thought this was
/removing/ the newline character.
Indeed, I don't object to it being added.
--
Kieran
>> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>>
>>> diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
>>> index df7029b..7db5501 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 78c7cee..935de52 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 04b0cb6..3a3f5bb 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 f5a20d3..af47739 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 26dbd25..331ada7 100644
>>> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
>>> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
>>> @@ -1675,6 +1675,6 @@ FrameBuffer *RPiCameraData::updateQueue(std::queue<FrameBuffer *> &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 0572acc..62605c0 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 aec590f..2352ab3 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 75fb297..b4ee021 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 7adb17e..8c00c0f 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 8ec0dac..a903a82 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 fc8085f..7416c37 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 6c8e955..3ebe66f 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 {
>>>
>
--
Regards
--
Kieran
More information about the libcamera-devel
mailing list