Skip to contentSkip to conversation

staging: media: intel-ipu3: Cleanup patchset for style issues

PATCH Superseded Mitali Borkar 3 participants 11 messages Apr 13, 2021

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover staging: media: intel-ipu3: Cleanup patchset for style issues

Changes from v1:-
Dropped patches 1/6 and 2/6 and compiled this as a patchset of 4 patches.
[PATCH 1/4]:- No changes.
[PATCH 2/4]:- No changes.
[PATCH 3/4]:- Reduced length of a line under 80 characters. This was patch 5/6 previously.
[PATCH 4/4]:- No changes.

Mitali Borkar (4):
staging: media: intel-ipu3: remove unnecessary blank line
staging: media: intel-ipu3: reduce length of line
staging: media: intel-ipu3: reduce length of line
staging: media: intel-ipu3: remove space before tabs

 .../staging/media/ipu3/include/intel-ipu3.h    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
Signature · 1 line
2.30.2
#1 lore raw

PATCH v2 1/4 staging: media: intel-ipu3: remove unnecessary blank line

Removed an unnecessary blank line to meet linux kernel coding style. Reported by checkpatch.pl

---

Changes from v1:- No changes.

 drivers/staging/media/ipu3/include/intel-ipu3.h | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -1
index d95ca9ebfafb..335522e7fc08 100644
@@ -75,7 +75,6 @@ struct ipu3_uapi_grid_config {
 	(IPU3_UAPI_AWB_MAX_SETS * \
 	 (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES))
 
-
 /**
  * struct ipu3_uapi_awb_raw_buffer - AWB raw buffer
  *
Signature · 1 line
2.30.2
#2 lore raw

PATCH v2 2/4 staging: media: intel-ipu3: reduce length of line

In reply to Mitali Borkar

Reduced length of line as it was exceeding 100 characters by removing comments from same line and adding it to previous line. This makes code neater, and meets linux kernel coding style.
Reported by checkpatch.

---

Changes from v1:- No changes.

 drivers/staging/media/ipu3/include/intel-ipu3.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +4 -2
index 335522e7fc08..53f8e5dec8f5 100644
@@ -10,8 +10,10 @@
 /* from /drivers/staging/media/ipu3/include/videodev2.h */
 
 /* Vendor specific - used for IPU3 camera sub-system */
-#define V4L2_META_FMT_IPU3_PARAMS	v4l2_fourcc('i', 'p', '3', 'p') /* IPU3 processing parameters */
-#define V4L2_META_FMT_IPU3_STAT_3A	v4l2_fourcc('i', 'p', '3', 's') /* IPU3 3A statistics */
+/* IPU3 processing parameters */
+#define V4L2_META_FMT_IPU3_PARAMS	v4l2_fourcc('i', 'p', '3', 'p')
+/* IPU3 3A statistics */
+#define V4L2_META_FMT_IPU3_STAT_3A	v4l2_fourcc('i', 'p', '3', 's')
 
 /* from include/uapi/linux/v4l2-controls.h */
 #define V4L2_CID_INTEL_IPU3_BASE	(V4L2_CID_USER_BASE + 0x10c0)
Signature · 1 line
2.30.2
#3 lore raw

PATCH v2 3/4 staging: media: intel-ipu3: reduce length of line

In reply to Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
index 6a72c81d2b67..52dcc6cdcffc 100644
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);
 	struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
 } __packed;
 
Signature · 1 line
2.30.2
#10 lore raw

PATCH v2 4/4 staging: media: intel-ipu3: remove space before tabs

In reply to Mitali Borkar

Removed unnecessary space before tabs to adhere to linux kernel coding style.
Reported by checkpatch.

---

Changes from v1:- No changes.

 drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +1 -1
index 0451f8b7ba4f..340d97160bbb 100644
@@ -631,7 +631,7 @@ struct ipu3_uapi_bnr_static_config_wb_gains_thr_config {
  * @cg:	Gain coefficient for threshold calculation, [0, 31], default 8.
  * @ci:	Intensity coefficient for threshold calculation. range [0, 0x1f]
  *	default 6.
- * 	format: u3.2 (3 most significant bits represent whole number,
+ *	format: u3.2 (3 most significant bits represent whole number,
  *	2 least significant bits represent the fractional part
  *	with each count representing 0.25)
  *	e.g. 6 in binary format is 00110, that translates to 1.5
Signature · 1 line
2.30.2
maintainer
#4 lore raw

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

In reply to Mitali Borkar

Hi Mitali,

Thanks for the update.

Quoted 16 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
index 6a72c81d2b67..52dcc6cdcffc 100644

drivers/staging/media/ipu3/include/intel-ipu3.h struct ipu3_uapi_ae_ccm { · line 251

Quoted 6 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);

Do you still have the other two patches in your tree? This doesn't apply here due to the different attribute syntax.

Quoted 3 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
 	struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
 } __packed;
 
Signature · 3 lines
Kind regards,

Sakari Ailus
#5 lore raw

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

Quoted 16 lines · Sakari Ailus

Hi Mitali,

Thanks for the update.

Quoted 11 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 15 lines

drivers/staging/media/ipu3/include/intel-ipu3.h struct ipu3_uapi_ae_ccm { · line 251

Quoted 11 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
index 6a72c81d2b67..52dcc6cdcffc 100644
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);

Do you still have the other two patches in your tree? This doesn't apply here due to the different attribute syntax.

I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Quoted 8 lines
Quoted 3 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
 	struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
 } __packed;
 
Signature · 3 lines
Kind regards,

Sakari Ailus
maintainer
#6 lore raw

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

Quoted 32 lines · Mitali Borkar
Quoted 16 lines · Sakari Ailus

Hi Mitali,

Thanks for the update.

Quoted 11 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 15 lines

drivers/staging/media/ipu3/include/intel-ipu3.h struct ipu3_uapi_ae_ccm { · line 251

Quoted 11 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
index 6a72c81d2b67..52dcc6cdcffc 100644
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);

Do you still have the other two patches in your tree? This doesn't apply here due to the different attribute syntax.

Quoted 1 line

I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Could you drop them and then submit v3?

Thanks.

Signature · 1 line
Sakari Ailus
#7 lore raw

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

Quoted 33 lines · Sakari Ailus
Quoted 32 lines · Mitali Borkar
Quoted 31 lines · Sakari Ailus

Hi Mitali,

Thanks for the update.

Quoted 16 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
index 6a72c81d2b67..52dcc6cdcffc 100644

drivers/staging/media/ipu3/include/intel-ipu3.h struct ipu3_uapi_ae_ccm { · line 251

Quoted 6 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);

Do you still have the other two patches in your tree? This doesn't apply here due to the different attribute syntax.

Quoted 4 lines
Quoted 1 line

I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Could you drop them and then submit v3?

I am extremely sorry Sir, but I am still learning to use git, drop them means to delete those commits? Even if I delete those, this patch was made after those, so the changes I made then will remain as it is, so what to do now?

Quoted 4 lines

Thanks.

Signature · 1 line
Sakari Ailus
maintainer
#8 lore raw

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

Quoted 34 lines · Mitali Borkar
Quoted 33 lines · Sakari Ailus
Quoted 32 lines · Mitali Borkar
Quoted 31 lines · Sakari Ailus

Hi Mitali,

Thanks for the update.

Quoted 16 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
index 6a72c81d2b67..52dcc6cdcffc 100644

drivers/staging/media/ipu3/include/intel-ipu3.h struct ipu3_uapi_ae_ccm { · line 251

Quoted 6 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +2 -1
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] __aligned(32);
+	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+							__aligned(32);

Do you still have the other two patches in your tree? This doesn't apply here due to the different attribute syntax.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Could you drop them and then submit v3?

I am extremely sorry Sir, but I am still learning to use git, drop them means to delete those commits? Even if I delete those, this patch was made after those, so the changes I made then will remain as it is, so what to do now?

No worries.

Yes, please remove the two commits, as you need to use the same (or at least non-conflicting) baseline for the patches compared to the tree where the patches will be applied.

So in practice what you need to do is to rebase these four patches on linux-media tree's master branch and resolve the resulting conflict in this patch (as the preceding patches no longer have the attribute changes).

The -i option for git rebase in particular is useful.

Signature · 1 line
Sakari Ailus
#9 lore raw

Re: [Outreachy kernel] Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

In reply to Mitali Borkar
Quoted 29 lines · CEST Mitali Borkar
Quoted 28 lines · Sakari Ailus
Quoted 27 lines · Mitali Borkar
Quoted 26 lines · Sakari Ailus

Hi Mitali,

Thanks for the update.

Quoted 21 lines · Mitali Borkar

Reduced length of the line under 80 characters to meet linux-kernel
coding style.

---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/staging/media/ipu3/include/intel-ipu3.h index 6a72c81d2b67..52dcc6cdcffc 100644

drivers/staging/media/ipu3/include/intel-ipu3.h +0 -0
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
 
  */
 
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/staging/media/ipu3/include/intel-ipu3.h +0 -1
 struct ipu3_uapi_ae_config {
 
 	struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
 
-	struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]

__aligned(32); + struct ipu3_uapi_ae_weight_elem
weights[IPU3_UAPI_AE_WEIGHTS] +

			__aligned(32);
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

Do you still have the other two patches in your tree? This doesn't apply
here due to the different attribute syntax.

Quoted 11 lines
Quoted 3 lines
Quoted 1 line

I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Could you drop them and then submit v3?

I am extremely sorry Sir, but I am still learning to use git, drop them means to delete those commits? Even if I delete those, this patch was made after those, so the changes I made then will remain as it is, so what to do now?

Quoted 1 line

Thanks.

I think that this document can help:
https://kernelnewbies.org/GitTips

Fabio