Skip to contentSkip to conversation

spi: mediatek: Attempt to address style issues in spi-mt7621.c

PATCH In review Armando Miraglia 8 participants 20 messages Mar 13, 2019 – Mar 14, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: mediatek: Attempt to address style issues in spi-mt7621.c

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +14 -13
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST	BIT(3)
 
 struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))
 		spi->max_speed_hz = (rs->sys_freq / 2);
 
 	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},
 	{},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);
 
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
 static struct platform_driver mt7621_spi_driver = {
 	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },
 	.probe = mt7621_spi_probe,
 	.remove = mt7621_spi_remove,
 };
Signature · 1 line
2.21.0.360.g471c308f928-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

Not sure if that is something you want to work on :)

Regards,
Matthias

Quoted 67 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +14 -13
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST	BIT(3)
 
 struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))
 		spi->max_speed_hz = (rs->sys_freq / 2);
 
 	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},
 	{},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);
 
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
 static struct platform_driver mt7621_spi_driver = {
 	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },
 	.probe = mt7621_spi_probe,
 	.remove = mt7621_spi_remove,
 };
#2 lore raw

That might be fun to try :) I should get an mt7621 dev board of sorts though.

Quoted 87 lines · Matthias Brugger
Quoted 5 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

Not sure if that is something you want to work on :)

Regards,
Matthias

Quoted 67 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +14 -13
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST     BIT(3)
 
 struct mt7621_spi {
-     struct spi_master       *master;
-     void __iomem            *base;
-     unsigned int            sys_freq;
-     unsigned int            speed;
-     struct clk              *clk;
-     int                     pending_write;
-
-     struct mt7621_spi_ops   *ops;
+     struct spi_master *master;
+     void __iomem *base;
+     unsigned int sys_freq;
+     unsigned int speed;
+     struct clk *clk;
+     int pending_write;
+
+     struct mt7621_spi_ops *ops;
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
      struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
      if ((spi->max_speed_hz == 0) ||
-             (spi->max_speed_hz > (rs->sys_freq / 2)))
+         (spi->max_speed_hz > (rs->sys_freq / 2)))
              spi->max_speed_hz = (rs->sys_freq / 2);
 
      if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-     { .compatible = "ralink,mt7621-spi" },
+     {.compatible = "ralink,mt7621-spi"},
      {},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);
 
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
 static struct platform_driver mt7621_spi_driver = {
      .driver = {
-             .name = DRIVER_NAME,
-             .of_match_table = mt7621_spi_match,
-     },
+                .name = DRIVER_NAME,
+                .of_match_table = mt7621_spi_match,
+                },
      .probe = mt7621_spi_probe,
      .remove = mt7621_spi_remove,
 };
#3 lore raw
In reply to Matthias Brugger

Hi!

Quoted 7 lines · Matthias Brugger

On 13/03/2019 13:24, Armando Miraglia wrote:
[...]
Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

It's impossible. They are completely different IPs.

Quoted 5 lines

Not sure if that is something you want to work on :)

Regards,
Matthias

maintainer
#4 lore raw
Quoted 10 lines · Chuanhong Guo

Hi!

Quoted 7 lines · Matthias Brugger

On 13/03/2019 13:24, Armando Miraglia wrote:
[...]
Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

It's impossible. They are completely different IPs.

Thanks for the info. Do you know the status of the rest of the drivers in staging?

Best regards,
Matthias

#5 lore raw
Quoted 8 lines · Matthias Brugger
Quoted 5 lines · Chuanhong Guo

Hi!

Quoted 3 lines · Matthias Brugger
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines · Armando Miraglia

[...]
Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

It's impossible. They are completely different IPs.

Thanks for the info. Do you know the status of the rest of the drivers in staging?

Just to inform you. We are using this SPI driver from staging in one of our customer projects and I will try to move this driver out of staging into drivers/spi very shortly.

Thanks,
Stefan

#6 lore raw
Quoted 13 lines · Stefan Roese
Quoted 12 lines · Matthias Brugger
Quoted 9 lines · Chuanhong Guo

Hi!

Quoted 7 lines · Matthias Brugger

On 13/03/2019 13:24, Armando Miraglia wrote:
[...]
Apart from fixing styling issues it would be usefull to see if we can add support for mt7621 to drivers/spi/spi-mt65xx.c

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

It's impossible. They are completely different IPs.

Thanks for the info. Do you know the status of the rest of the drivers in staging?

Just to inform you. We are using this SPI driver from staging in one of our customer projects and I will try to move this driver out of staging into drivers/spi very shortly.

This is good news! I think the driver is ready to move out of staging and would be very happy to see you do it.

My only small concern is that this driver was backported to openwrt (4.14 based) and then reverted

https://github.com/openwrt/openwrt/commit/749a29f76ca780d8df70a5163d43bbdc6f13ba3f

"This breaks some mt7621 devices."

Possibly it was backported badly, or possibly there is a problem.

John: do you have any more details of the problem other than what is in the commit message?

Thanks,
NeilBrown

#7 lore raw

Hi!

Quoted 10 lines · NeilBrown

[...]
My only small concern is that this driver was backported to openwrt (4.14 based) and then reverted

https://github.com/openwrt/openwrt/commit/749a29f76ca780d8df70a5163d43bbdc6f13ba3f

"This breaks some mt7621 devices."

Possibly it was backported badly, or possibly there is a problem.

Last time I backported the version with broken SPI modes so it got broken SPI CS1 support. There is one mt7621 router using SPI CS1 in OpenWrt and the backported driver broke it.
It has been fixed by my two "drop broken spi modes" patches.

Quoted 6 lines

John: do you have any more details of the problem other than what is in the commit message?

Thanks,
NeilBrown

Regards,
Chuanhong Guo

#8 lore raw
Quoted 9 lines · Chuanhong Guo

Hi!

Quoted 7 lines · NeilBrown

[...]
My only small concern is that this driver was backported to openwrt (4.14 based) and then reverted

https://github.com/openwrt/openwrt/commit/749a29f76ca780d8df70a5163d43bbdc6f13ba3f

Quoted 7 lines
Quoted 3 lines

"This breaks some mt7621 devices."

Possibly it was backported badly, or possibly there is a problem.

Last time I backported the version with broken SPI modes so it got broken SPI CS1 support. There is one mt7621 router using SPI CS1 in OpenWrt and the backported driver broke it.
It has been fixed by my two "drop broken spi modes" patches.

Ahh, thanks for the clarification. Good to know all known problems are fixed.

Thanks,
NeilBrown

Quoted 9 lines
Quoted 6 lines

John: do you have any more details of the problem other than what is in the commit message?

Thanks,
NeilBrown

Regards,
Chuanhong Guo

#9 lore raw
In reply to Armando Miraglia
Quoted 4 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Don't run lindent. I think checkpatch.pl has a --fix option that might be better, but once the code is merged then our standard become much higher for follow up patches.

Quoted 20 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +0 -6
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST	BIT(3)
 
 struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;

drivers/staging/mt7621-spi/spi-mt7621.c line 62

Quoted 10 lines
drivers/staging/mt7621-spi/spi-mt7621.c +8 -2
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;

The original is fine. I don't encourage people to do fancy indenting with their local variable declarations inside functions but for a struct the declarations aren't going to change a lot so people can get fancy if they want.

The problem with a local is if you need to add a new variable then you have to re-indent a bunch of unrelated lines or have one out of alignment line. Most people know this intuitively so they don't get fancy.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 319

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 		spi->max_speed_hz = (rs->sys_freq / 2);
 
 	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},

The original was better.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 323

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -0
 	{},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);

No need for a blank. These are closely related.

drivers/staging/mt7621-spi/spi-mt7621.c MODULE_ALIAS("platform:" DRIVER_NAME); · line 414

Quoted 12 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -3
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
 static struct platform_driver mt7621_spi_driver = {
 	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },

The new indenting is very wrong.

regards,
dan carpenter

maintainer
#10 lore raw
Quoted 86 lines · Dan Carpenter
Quoted 4 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Don't run lindent. I think checkpatch.pl has a --fix option that might be better, but once the code is merged then our standard become much higher for follow up patches.

Quoted 20 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +0 -6
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST	BIT(3)
 
 struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;

drivers/staging/mt7621-spi/spi-mt7621.c line 62

Quoted 10 lines
drivers/staging/mt7621-spi/spi-mt7621.c +8 -2
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;

The original is fine. I don't encourage people to do fancy indenting with their local variable declarations inside functions but for a struct the declarations aren't going to change a lot so people can get fancy if they want.

The problem with a local is if you need to add a new variable then you have to re-indent a bunch of unrelated lines or have one out of alignment line. Most people know this intuitively so they don't get fancy.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 319

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 		spi->max_speed_hz = (rs->sys_freq / 2);
 
 	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},

The original was better.

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 323

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -0
 	{},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);

No need for a blank. These are closely related.

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
Quoted 11 lines

drivers/staging/mt7621-spi/spi-mt7621.c MODULE_ALIAS("platform:" DRIVER_NAME); · line 414

Quoted 8 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -3
 static struct platform_driver mt7621_spi_driver = {
 	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },

The new indenting is very wrong.

Fair enough, I was too fast providing my Reviewed-by tag :-/

#11 lore raw
In reply to Dan Carpenter

My answers are in-line below. BTW bare with me as this is my attempt to get my feet wet in how to contribute to the linux kernel for my own pleasure and interest :)

Quoted 37 lines · Dan Carpenter
Quoted 4 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Don't run lindent. I think checkpatch.pl has a --fix option that might be better, but once the code is merged then our standard become much higher for follow up patches.

Quoted 27 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

 drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +5 -8
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
 #define MT7621_LSB_FIRST	BIT(3)
 
 struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
Quoted 9 lines

drivers/staging/mt7621-spi/spi-mt7621.c line 62

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -0
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;

The original is fine. I don't encourage people to do fancy indenting with their local variable declarations inside functions but for a struct the declarations aren't going to change a lot so people can get fancy if they want.

Is there an explicit intent to deprecate Lindent in favor of checkpatch.pl --fix? If one would like to contribute to fixing the tooling for linting which of the two would be the right target for such an effort?

Quoted 11 lines

The problem with a local is if you need to add a new variable then you have to re-indent a bunch of unrelated lines or have one out of alignment line. Most people know this intuitively so they don't get fancy.

Quoted 6 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
Quoted 5 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

Funny enough, this is something I adjusted manually :)

Quoted 12 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 319

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 		spi->max_speed_hz = (rs->sys_freq / 2);
 
 	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
 }
 
 static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},

The original was better.

Quoted 6 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 323

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -0
 	{},
 };
+
 MODULE_DEVICE_TABLE(of, mt7621_spi_match);

No need for a blank. These are closely related.

Ack.

Quoted 4 lines
Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
 static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
Quoted 10 lines

drivers/staging/mt7621-spi/spi-mt7621.c MODULE_ALIAS("platform:" DRIVER_NAME); · line 414

Quoted 8 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -3
 static struct platform_driver mt7621_spi_driver = {
 	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },

The new indenting is very wrong.

Ack. In fact, I was thinking this could be one target to fix the logic in Lindent to do this appropriately.

I have a process question here: to post a change for the only accepted change I have in this patch should I send out a new patch?

Thanks for the help and the review!
Cheers,
A.

#12 lore raw
Quoted 4 lines · Armando Miraglia

My answers are in-line below. BTW bare with me as this is my attempt to get my feet wet in how to contribute to the linux kernel for my own pleasure and interest :)

No problem at all.

Quoted 4 lines

Is there an explicit intent to deprecate Lindent in favor of checkpatch.pl --fix? If one would like to contribute to fixing the tooling for linting which of the two would be the right target for such an effort?

I've added Jean to the CC list because he worked on Lindent a few years ago. I really think we should just delete Lindent. I haven't used the checkpatch.pl --fix option but Joe Perches has good style.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)

drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
Quoted 8 lines
Quoted 5 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
 	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

Funny enough, this is something I adjusted manually :)

:) Good.

Quoted 3 lines

I have a process question here: to post a change for the only accepted change I have in this patch should I send out a new patch?

Yeah. If you want. Google for how to send a v2 patch.

regards,
dan carpenter

#13 lore raw

Hi Dan,

Quoted 8 lines · Dan Carpenter
Quoted 3 lines · Armando Miraglia

Is there an explicit intent to deprecate Lindent in favor of checkpatch.pl --fix? If one would like to contribute to fixing the tooling for linting which of the two would be the right target for such an effort?

I've added Jean to the CC list because he worked on Lindent a few years ago. I really think we should just delete Lindent. I haven't used the checkpatch.pl --fix option but Joe Perches has good style.

I merely fixed obvious but minor issues in Lindent as I stumbled upon them the one time in my life I used that script. That was years ago. I'm not using it on a regular basis. My principle is that if a script is present in the kernel tree then it can and should be maintained. If it is deemed not worth the maintenance effort then it should be deleted. I don't care either way.

Signature · 2 lines
Jean Delvare
SUSE L3 Support
#14 lore raw
Quoted 4 lines · Jean Delvare

My principle is that if a script
is present in the kernel tree then it can and should be maintained. If it is deemed not worth the maintenance effort then it should be deleted.

I've suggested deleting Lindent in the past.
https://lkml.org/lkml/2013/2/11/390

Also there is now the clang-format tool that
does an OK job of reflowing source to something
approximating the typical kernel style.

See: Documentation/process/clang-format.rst

#15 lore raw
In reply to Armando Miraglia

Hi Armando,

Quoted 110 lines · Armando Miraglia

My answers are in-line below. BTW bare with me as this is my attempt to get my feet wet in how to contribute to the linux kernel for my own pleasure and interest :)

Quoted 37 lines · Dan Carpenter
Quoted 4 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Don't run lindent. I think checkpatch.pl has a --fix option that might be better, but once the code is merged then our standard become much higher for follow up patches.

Quoted 27 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

  drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
  1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +5 -8
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
  #define MT7621_LSB_FIRST	BIT(3)
 
  struct mt7621_spi {
-	struct spi_master	*master;
-	void __iomem		*base;
-	unsigned int		sys_freq;
-	unsigned int		speed;
-	struct clk		*clk;
-	int			pending_write;
-
-	struct mt7621_spi_ops	*ops;
+	struct spi_master *master;
+	void __iomem *base;
+	unsigned int sys_freq;
+	unsigned int speed;
+	struct clk *clk;
Quoted 9 lines

drivers/staging/mt7621-spi/spi-mt7621.c line 62

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -0
+	int pending_write;
+
+	struct mt7621_spi_ops *ops;

The original is fine. I don't encourage people to do fancy indenting with their local variable declarations inside functions but for a struct the declarations aren't going to change a lot so people can get fancy if they want.

Is there an explicit intent to deprecate Lindent in favor of checkpatch.pl --fix? If one would like to contribute to fixing the tooling for linting which of the two would be the right target for such an effort?

Quoted 11 lines

The problem with a local is if you need to add a new variable then you have to re-indent a bunch of unrelated lines or have one out of alignment line. Most people know this intuitively so they don't get fancy.

Quoted 6 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
  };
 
  static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
  	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
Quoted 5 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
  	if ((spi->max_speed_hz == 0) ||
-		(spi->max_speed_hz > (rs->sys_freq / 2)))
+	    (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

Funny enough, this is something I adjusted manually :)

Quoted 12 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 319

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
  		spi->max_speed_hz = (rs->sys_freq / 2);
 
  	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
  }
 
  static const struct of_device_id mt7621_spi_match[] = {
-	{ .compatible = "ralink,mt7621-spi" },
+	{.compatible = "ralink,mt7621-spi"},

The original was better.

Quoted 6 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 323

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -0
  	{},
  };
+
  MODULE_DEVICE_TABLE(of, mt7621_spi_match);

No need for a blank. These are closely related.

Ack.

Quoted 4 lines
Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
  static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
Quoted 10 lines

drivers/staging/mt7621-spi/spi-mt7621.c MODULE_ALIAS("platform:" DRIVER_NAME); · line 414

Quoted 8 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -3
  static struct platform_driver mt7621_spi_driver = {
  	.driver = {
-		.name = DRIVER_NAME,
-		.of_match_table = mt7621_spi_match,
-	},
+		   .name = DRIVER_NAME,
+		   .of_match_table = mt7621_spi_match,
+		   },

The new indenting is very wrong.

Quoted 5 lines

Ack. In fact, I was thinking this could be one target to fix the logic in Lindent to do this appropriately.

I have a process question here: to post a change for the only accepted change I have in this patch should I send out a new patch?

Would it be possible for you to wait a bit with this minor cleanup? As I'm preparing a patch to move this driver out of staging right now. You can definitely follow-up with your cleanup, once this move is done. Otherwise the move might be delayed even more.

Thanks,
Stefan

#16 lore raw

Absolutely!

Cheers,
A.

Quoted 127 lines · Stefan Roese

Hi Armando,

Quoted 110 lines · Armando Miraglia

My answers are in-line below. BTW bare with me as this is my attempt to get my feet wet in how to contribute to the linux kernel for my own pleasure and interest :)

Quoted 37 lines · Dan Carpenter
Quoted 4 lines · Armando Miraglia

Running Lindent on the mt7621-spi.c file in drivers/staging I noticed that the file contained style issues. This change attempts to address such style problems.

Don't run lindent. I think checkpatch.pl has a --fix option that might be better, but once the code is merged then our standard become much higher for follow up patches.

Quoted 27 lines

---
NOTE: resend this patch to include all mainteners listed by get_mantainers.pl.

  drivers/staging/mt7621-spi/spi-mt7621.c | 27 +++++++++++++------------
  1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/mt7621-spi/spi-mt7621.c +5 -8
index b509f9fe3346..03d53845f8c5 100644
@@ -52,14 +52,14 @@
  #define MT7621_LSB_FIRST  BIT(3)
 
  struct mt7621_spi {
-   struct spi_master       *master;
-   void __iomem            *base;
-   unsigned int            sys_freq;
-   unsigned int            speed;
-   struct clk              *clk;
-   int                     pending_write;
-
-   struct mt7621_spi_ops   *ops;
+   struct spi_master *master;
+   void __iomem *base;
+   unsigned int sys_freq;
+   unsigned int speed;
+   struct clk *clk;
Quoted 9 lines

drivers/staging/mt7621-spi/spi-mt7621.c line 62

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -0
+   int pending_write;
+
+   struct mt7621_spi_ops *ops;

The original is fine. I don't encourage people to do fancy indenting with their local variable declarations inside functions but for a struct the declarations aren't going to change a lot so people can get fancy if they want.

Is there an explicit intent to deprecate Lindent in favor of checkpatch.pl --fix? If one would like to contribute to fixing the tooling for linting which of the two would be the right target for such an effort?

Quoted 11 lines

The problem with a local is if you need to add a new variable then you have to re-indent a bunch of unrelated lines or have one out of alignment line. Most people know this intuitively so they don't get fancy.

Quoted 6 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
  };
 
  static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -303,7 +303,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
    struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
 
Quoted 5 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 306

Quoted 3 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
    if ((spi->max_speed_hz == 0) ||
-           (spi->max_speed_hz > (rs->sys_freq / 2)))
+       (spi->max_speed_hz > (rs->sys_freq / 2)))

Yeah. Lindent is correct here.

Funny enough, this is something I adjusted manually :)

Quoted 12 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 319

Quoted 9 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -1
            spi->max_speed_hz = (rs->sys_freq / 2);
 
    if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
@@ -316,9 +316,10 @@ static int mt7621_spi_setup(struct spi_device *spi)
  }
 
  static const struct of_device_id mt7621_spi_match[] = {
-   { .compatible = "ralink,mt7621-spi" },
+   {.compatible = "ralink,mt7621-spi"},

The original was better.

Quoted 6 lines

drivers/staging/mt7621-spi/spi-mt7621.c static int mt7621_spi_setup(struct spi_device *spi) · line 323

Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +1 -0
    {},
  };
+
  MODULE_DEVICE_TABLE(of, mt7621_spi_match);

No need for a blank. These are closely related.

Ack.

Quoted 4 lines
Quoted 4 lines
drivers/staging/mt7621-spi/spi-mt7621.c +0 -0
  static int mt7621_spi_probe(struct platform_device *pdev)
@@ -408,9 +409,9 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
 
Quoted 10 lines

drivers/staging/mt7621-spi/spi-mt7621.c MODULE_ALIAS("platform:" DRIVER_NAME); · line 414

Quoted 8 lines
drivers/staging/mt7621-spi/spi-mt7621.c +3 -3
  static struct platform_driver mt7621_spi_driver = {
    .driver = {
-           .name = DRIVER_NAME,
-           .of_match_table = mt7621_spi_match,
-   },
+              .name = DRIVER_NAME,
+              .of_match_table = mt7621_spi_match,
+              },

The new indenting is very wrong.

Quoted 5 lines

Ack. In fact, I was thinking this could be one target to fix the logic in Lindent to do this appropriately.

I have a process question here: to post a change for the only accepted change I have in this patch should I send out a new patch?

Would it be possible for you to wait a bit with this minor cleanup? As I'm preparing a patch to move this driver out of staging right now. You can definitely follow-up with your cleanup, once this move is done. Otherwise the move might be delayed even more.

Thanks,
Stefan

maintainer
#17 lore raw
Quoted 1 line · Armando Miraglia

Absolutely!

Please don't top post :)

Quoted 5 lines

Cheers,
A.

On Thu, Mar 14, 2019 at 12:36 PM Stefan Roese <[email protected]> wrote:

[...]

Quoted 6 lines
Quoted 6 lines

Would it be possible for you to wait a bit with this minor cleanup? As I'm preparing a patch to move this driver out of staging right now. You can definitely follow-up with your cleanup, once this move is done. Otherwise the move might be delayed even more.

Hm but shouldn't style issues be a criteria for not accepting a move out of staging? I think so. You could add Armandos patch in your series or rebase your series against Greg's tree, once he took the clean-up. Normally Greg is incredibly fast :)

Regards,
Matthias

#18 lore raw
Quoted 14 lines · Matthias Brugger
Quoted 1 line · Armando Miraglia

Absolutely!

Please don't top post :)

Quoted 5 lines

Cheers,
A.

On Thu, Mar 14, 2019 at 12:36 PM Stefan Roese <[email protected]> wrote:

[...]

Quoted 1 line
Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines

Would it be possible for you to wait a bit with this minor cleanup? As I'm preparing a patch to move this driver out of staging right now. You can definitely follow-up with your cleanup, once this move is done. Otherwise the move might be delayed even more.

Hm but shouldn't style issues be a criteria for not accepting a move out of staging?

I would agree, if those style issues where non trivial. In the end we are talking about one non-optimal identation now.

Quoted 3 lines

I think so. You could add Armandos patch in your series or rebase your series against Greg's tree, once he took the clean-up. Normally Greg is incredibly fast :)

I should have included the history here to make this more clean. I've started pulling this driver out of staging a few weeks ago:

https://patchwork.kernel.org/patch/10790537/
...

Here you find Greg's comment, that the style patches should be merged first before the move out of staging. This is what I worked on after this first patch series:

https://patchwork.kernel.org/patch/10792455/
...

Now these 9 style issue patches from me have been merged and I would like to proceed with the driver move.

Thanks,
Stefan

maintainer
#19 lore raw
Quoted 21 lines · Stefan Roese
Quoted 20 lines · Matthias Brugger
Quoted 1 line · Armando Miraglia

Absolutely!

Please don't top post :)

Quoted 5 lines

Cheers,
A.

On Thu, Mar 14, 2019 at 12:36 PM Stefan Roese <[email protected]> wrote:

[...]

Quoted 6 lines
Quoted 6 lines

Would it be possible for you to wait a bit with this minor cleanup? As I'm preparing a patch to move this driver out of staging right now. You can definitely follow-up with your cleanup, once this move is done. Otherwise the move might be delayed even more.

Quoted 5 lines
Quoted 2 lines

Hm but shouldn't style issues be a criteria for not accepting a move out of staging?

I would agree, if those style issues where non trivial. In the end we are talking about one non-optimal identation now.>

Fair enough, anyway I'm not the person to decide on that :)

Regards,
Matthias

Quoted 22 lines
Quoted 3 lines

I think so. You could add Armandos patch in your series or rebase your series against Greg's tree, once he took the clean-up. Normally Greg is incredibly fast :)

I should have included the history here to make this more clean. I've started pulling this driver out of staging a few weeks ago:

https://patchwork.kernel.org/patch/10790537/
...

Here you find Greg's comment, that the style patches should be merged first before the move out of staging. This is what I worked on after this first patch series:

https://patchwork.kernel.org/patch/10792455/
...

Now these 9 style issue patches from me have been merged and I would like to proceed with the driver move.

Thanks,
Stefan