From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 815C233E5 for ; Wed, 27 Apr 2022 19:52:25 +0000 (UTC) Received: by mail-ed1-f44.google.com with SMTP id k27so3167028edk.4 for ; Wed, 27 Apr 2022 12:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=raaDFFrcCGJx4BjUQiZ33LAZA2tAaSchP/oiKff0LFo=; b=mBfMA5ennm0eqStm8gsXmriVXxW6bwZMEHA7hyl/NXaLZq1WK5m6yJkjvDJODSsxgq pAfAMaLp1EVQyB9s4QmfA4WcL79NSsg+kdKMCckB4WvVAWMluH31XfCSajIiUw5P9y1D bDE+cmB5MA7PWHjCC/vbgnMqENdyPcd88QG3mWhsp/Gwb0w/8W36uDJhyqsp1AbYDUVV Lw9710jnygGjOB1+uCUa2if6kpJzV7uyef6n7RMU5JthrIk6iEWNm3Hil0ugbV8iLFZR STci1lTS/fkTwbh3jidkcT3B0EHvS7s0dqPZfRCe3b8zda+ZeXR68VF2gyVjWpU5c03u q4Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=raaDFFrcCGJx4BjUQiZ33LAZA2tAaSchP/oiKff0LFo=; b=xIyHGymRZtEqZipU6pbIWKlg/hXKy3KZAiD/Nem3sqsw1ULziu6AdYrYn4wd6jizG2 /KYkoB0aDMC6oHS1gmqAA6Pt2bD1t7ML4c/65rfzaAoLuFzIUgrYfJR+i2G3DAxMSqGa rnu5ib1aFW31Kedym8khsIkDT4EjGii2P9EC6+78dOMXvuHcFL1esoz4fYfPlOY9L3V5 GWrVMsf8ID415LsQI3Ab3WpLQCvKvn+lxe/CV0Ngq5LZceUDmbMKcnJ/ceKtA7ibpfO3 xCsHC6WWKAzgKjktLErpyQVivCEklIVFyHgb0PfW7JM6FzQgEeLD753LR5wSuM9o3z81 kJGg== X-Gm-Message-State: AOAM5306pBUQMMnmOP52qNX6wiNzzp9Zj/KJkccYWpaji5olRgK+lWjm 0BMlbE7ic7rsQZla02WqZiI= X-Google-Smtp-Source: ABdhPJyaHhiQPHbBDsazEv+z+wxrmRg4LeZEEozM4E20LE6khcKaC6GdZk4/CDLHVNc/o6EsUE9iBw== X-Received: by 2002:a05:6402:d2:b0:413:2e50:d6fd with SMTP id i18-20020a05640200d200b004132e50d6fdmr32263726edu.171.1651089143874; Wed, 27 Apr 2022 12:52:23 -0700 (PDT) Received: from jernej-laptop.localnet (89-212-118-115.static.t-2.net. [89.212.118.115]) by smtp.gmail.com with ESMTPSA id r2-20020aa7c142000000b0042617ba63c5sm109134edp.79.2022.04.27.12.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 12:52:23 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Paul Kocialkowski Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: Re: [PATCH v4 38/45] media: sun6i-csi: Cleanup headers and includes, update copyright lines Date: Wed, 27 Apr 2022 21:52:22 +0200 Message-ID: <2576615.BddDVKsqQX@jernej-laptop> In-Reply-To: <20220415152811.636419-39-paul.kocialkowski@bootlin.com> References: <20220415152811.636419-1-paul.kocialkowski@bootlin.com> <20220415152811.636419-39-paul.kocialkowski@bootlin.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Dne petek, 15. april 2022 ob 17:28:04 CEST je Paul Kocialkowski napisal(a): > Cleanup includes, update copyright lines and some cosmetic changes. > > Signed-off-by: Paul Kocialkowski Acked-by: Jernej Skrabec Best regards, Jernej > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 16 ++++++-------- > .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ++++----- > .../sunxi/sun6i-csi/sun6i_csi_capture.c | 4 ++-- > .../sunxi/sun6i-csi/sun6i_csi_capture.h | 22 ++++++++++++++----- > .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 9 ++++---- > 5 files changed, 35 insertions(+), 26 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index > 0ae10a11373c..43b6557b3207 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -1,18 +1,14 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > #include > -#include > -#include > #include > -#include > #include > -#include > -#include > #include > #include > #include > @@ -20,12 +16,13 @@ > #include > #include > #include > -#include > -#include > -#include > +#include > +#include > #include > > #include "sun6i_csi.h" > +#include "sun6i_csi_bridge.h" > +#include "sun6i_csi_capture.h" > #include "sun6i_csi_reg.h" > > /* Media */ > @@ -390,4 +387,5 @@ module_platform_driver(sun6i_csi_platform_driver); > > MODULE_DESCRIPTION("Allwinner A31 Camera Sensor Interface driver"); > MODULE_AUTHOR("Yong Deng "); > +MODULE_AUTHOR("Paul Kocialkowski "); > MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h index > 68611c147996..1aeaef84abba 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > @@ -1,16 +1,16 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CSI_H__ > -#define __SUN6I_CSI_H__ > +#ifndef _SUN6I_CSI_H_ > +#define _SUN6I_CSI_H_ > > #include > #include > -#include > #include > > #include "sun6i_csi_bridge.h" > @@ -51,4 +51,4 @@ struct sun6i_csi_variant { > unsigned long clock_mod_rate; > }; > > -#endif /* __SUN6I_CSI_H__ */ > +#endif > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index > c3b1e1411da4..f1581b877819 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > @@ -1,13 +1,13 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > #include > #include > - > #include > #include > #include > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h index > 59c57bcefeec..ceceb030aef6 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > @@ -1,15 +1,15 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CAPTURE_H__ > -#define __SUN6I_CAPTURE_H__ > +#ifndef _SUN6I_CAPTURE_H_ > +#define _SUN6I_CAPTURE_H_ > > -#include > -#include > +#include > > #define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture" > > @@ -57,21 +57,31 @@ struct sun6i_csi_capture { > struct v4l2_format format; > }; > > +/* Helpers */ > + > void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev, > unsigned int *width, unsigned int *height); > void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, > u32 *pixelformat, u32 *field); > > +/* Format */ > + > const > struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 > pixelformat); > > +/* Capture */ > + > void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_state_update(struct sun6i_csi_device *csi_dev); > > +/* State */ > + > void sun6i_csi_capture_sync(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev); > > +/* Capture */ > + > int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev); > > -#endif /* __SUN6I_CAPTURE_H__ */ > +#endif > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h index > 1e4a07f26d1d..e01c5b9c2d60 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > @@ -1,12 +1,13 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CSI_REG_H__ > -#define __SUN6I_CSI_REG_H__ > +#ifndef _SUN6I_CSI_REG_H_ > +#define _SUN6I_CSI_REG_H_ > > #include > > @@ -180,4 +181,4 @@ > #define SUN6I_CSI_CH_FIFO_STAT_REG 0x98 > #define SUN6I_CSI_CH_PCLK_STAT_REG 0x9c > > -#endif /* __SUN6I_CSI_REG_H__ */ > +#endif From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E20DC433F5 for ; Wed, 27 Apr 2022 19:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DddSeXgxpWUX8iYDZRsnTjfIgaVx9cVtujMwfL+3X4c=; b=i+e0H5qY0f851r un6gOnGHJMuMxQRPYnG2ZnViBEpdUdOyxPcKvbhIIz/xa5UCY1jvCygDIOlkfGln914LLgb1bqn2/ FUyVOccadZbS/GQUZyO6rUaypiBjd4RRPCmATNtC/bpZ+uDxP1MOwT6Nvpmi6HnN7vn4OHnF1mFjx f9h90RzLYqCd/f0kn2zdN8oKSZlx4CNErTndwrbw6ADfHp9tE+QBNtjrNGqzhi4CmebdNnegcNPbG Ne3fF7fAYcMSwyCEaYTRWr9flONiWdHslFRxxa2n+vPIIlwBCWonAZ/Z6nZLmChwzDGWT59YpR+oB QHLD8pyyysqZa3imy+rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njni9-003PoO-RW; Wed, 27 Apr 2022 19:52:30 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njni5-003PnN-UW for linux-arm-kernel@lists.infradead.org; Wed, 27 Apr 2022 19:52:27 +0000 Received: by mail-ed1-x533.google.com with SMTP id d6so3155809ede.8 for ; Wed, 27 Apr 2022 12:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=raaDFFrcCGJx4BjUQiZ33LAZA2tAaSchP/oiKff0LFo=; b=mBfMA5ennm0eqStm8gsXmriVXxW6bwZMEHA7hyl/NXaLZq1WK5m6yJkjvDJODSsxgq pAfAMaLp1EVQyB9s4QmfA4WcL79NSsg+kdKMCckB4WvVAWMluH31XfCSajIiUw5P9y1D bDE+cmB5MA7PWHjCC/vbgnMqENdyPcd88QG3mWhsp/Gwb0w/8W36uDJhyqsp1AbYDUVV Lw9710jnygGjOB1+uCUa2if6kpJzV7uyef6n7RMU5JthrIk6iEWNm3Hil0ugbV8iLFZR STci1lTS/fkTwbh3jidkcT3B0EHvS7s0dqPZfRCe3b8zda+ZeXR68VF2gyVjWpU5c03u q4Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=raaDFFrcCGJx4BjUQiZ33LAZA2tAaSchP/oiKff0LFo=; b=xva/kBWx3ARjI0Fgsc76ZE7qQbFqwDm7uZGfzKUVSkYrBXGYc85eGl52nAjFrIwGJN CIkhHF6az0u0+wob6Cm3l1rIfqw3KUirp3xLo2s2KIQivQactdTQJLsqDB7qAPrktyjE 0wRSWSIIxaSt0a5MfAzeCI+qjS8NahRWlBO7Z4N1VMmDgg8ldRCgSnTV1PQSaOHdjCP9 fLvWc7dcjNi5YLeHULvDKGTZo+zRULwLe7kd9y3AQWZOS1W11WaqN/kDC4XwbK9TgFkb b/RPxafgJvdShy86d8xdUBv0MkG41RXwOm0k2llxA3hQfKKLpP8jbBmwOZzNb0SN5d5u J6kw== X-Gm-Message-State: AOAM533PUMemwSC7p9h++7UOYJE46cBui27lU1beuW7uI+ubL5uGCrLL kF+QCmOb+c40simgr+LYhnQ= X-Google-Smtp-Source: ABdhPJyaHhiQPHbBDsazEv+z+wxrmRg4LeZEEozM4E20LE6khcKaC6GdZk4/CDLHVNc/o6EsUE9iBw== X-Received: by 2002:a05:6402:d2:b0:413:2e50:d6fd with SMTP id i18-20020a05640200d200b004132e50d6fdmr32263726edu.171.1651089143874; Wed, 27 Apr 2022 12:52:23 -0700 (PDT) Received: from jernej-laptop.localnet (89-212-118-115.static.t-2.net. [89.212.118.115]) by smtp.gmail.com with ESMTPSA id r2-20020aa7c142000000b0042617ba63c5sm109134edp.79.2022.04.27.12.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 12:52:23 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Paul Kocialkowski Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: Re: [PATCH v4 38/45] media: sun6i-csi: Cleanup headers and includes, update copyright lines Date: Wed, 27 Apr 2022 21:52:22 +0200 Message-ID: <2576615.BddDVKsqQX@jernej-laptop> In-Reply-To: <20220415152811.636419-39-paul.kocialkowski@bootlin.com> References: <20220415152811.636419-1-paul.kocialkowski@bootlin.com> <20220415152811.636419-39-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220427_125226_046906_64B73213 X-CRM114-Status: GOOD ( 16.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne petek, 15. april 2022 ob 17:28:04 CEST je Paul Kocialkowski napisal(a): > Cleanup includes, update copyright lines and some cosmetic changes. > > Signed-off-by: Paul Kocialkowski Acked-by: Jernej Skrabec Best regards, Jernej > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 16 ++++++-------- > .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ++++----- > .../sunxi/sun6i-csi/sun6i_csi_capture.c | 4 ++-- > .../sunxi/sun6i-csi/sun6i_csi_capture.h | 22 ++++++++++++++----- > .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 9 ++++---- > 5 files changed, 35 insertions(+), 26 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index > 0ae10a11373c..43b6557b3207 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -1,18 +1,14 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > #include > -#include > -#include > #include > -#include > #include > -#include > -#include > #include > #include > #include > @@ -20,12 +16,13 @@ > #include > #include > #include > -#include > -#include > -#include > +#include > +#include > #include > > #include "sun6i_csi.h" > +#include "sun6i_csi_bridge.h" > +#include "sun6i_csi_capture.h" > #include "sun6i_csi_reg.h" > > /* Media */ > @@ -390,4 +387,5 @@ module_platform_driver(sun6i_csi_platform_driver); > > MODULE_DESCRIPTION("Allwinner A31 Camera Sensor Interface driver"); > MODULE_AUTHOR("Yong Deng "); > +MODULE_AUTHOR("Paul Kocialkowski "); > MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h index > 68611c147996..1aeaef84abba 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > @@ -1,16 +1,16 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CSI_H__ > -#define __SUN6I_CSI_H__ > +#ifndef _SUN6I_CSI_H_ > +#define _SUN6I_CSI_H_ > > #include > #include > -#include > #include > > #include "sun6i_csi_bridge.h" > @@ -51,4 +51,4 @@ struct sun6i_csi_variant { > unsigned long clock_mod_rate; > }; > > -#endif /* __SUN6I_CSI_H__ */ > +#endif > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index > c3b1e1411da4..f1581b877819 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > @@ -1,13 +1,13 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > #include > #include > - > #include > #include > #include > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h index > 59c57bcefeec..ceceb030aef6 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h > @@ -1,15 +1,15 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CAPTURE_H__ > -#define __SUN6I_CAPTURE_H__ > +#ifndef _SUN6I_CAPTURE_H_ > +#define _SUN6I_CAPTURE_H_ > > -#include > -#include > +#include > > #define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture" > > @@ -57,21 +57,31 @@ struct sun6i_csi_capture { > struct v4l2_format format; > }; > > +/* Helpers */ > + > void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev, > unsigned int *width, unsigned int *height); > void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, > u32 *pixelformat, u32 *field); > > +/* Format */ > + > const > struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 > pixelformat); > > +/* Capture */ > + > void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_state_update(struct sun6i_csi_device *csi_dev); > > +/* State */ > + > void sun6i_csi_capture_sync(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev); > > +/* Capture */ > + > int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev); > void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev); > > -#endif /* __SUN6I_CAPTURE_H__ */ > +#endif > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h index > 1e4a07f26d1d..e01c5b9c2d60 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h > @@ -1,12 +1,13 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) > - * All rights reserved. > * Author: Yong Deng > + * Copyright 2021-2022 Bootlin > + * Author: Paul Kocialkowski > */ > > -#ifndef __SUN6I_CSI_REG_H__ > -#define __SUN6I_CSI_REG_H__ > +#ifndef _SUN6I_CSI_REG_H_ > +#define _SUN6I_CSI_REG_H_ > > #include > > @@ -180,4 +181,4 @@ > #define SUN6I_CSI_CH_FIFO_STAT_REG 0x98 > #define SUN6I_CSI_CH_PCLK_STAT_REG 0x9c > > -#endif /* __SUN6I_CSI_REG_H__ */ > +#endif _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel