Skip to contentSkip to conversation

staging: speakup: fix wrong code indent

PATCH Superseded Michael Mera 2 participants 10 messages Apr 28, 2017 – May 9, 2017 Staging

lore
Share & tools
lore

Michael Mera

author
#0 lore raw

PATCH 1/1 staging: speakup: fix wrong code indent

Remove unecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/speakup/speakup_decpc.c +1 -3
index 6bf38e49a96d..94ca6987f71b 100644
@@ -84,9 +84,7 @@
 #define	CTRL_last_index		0x0b00	/*   get last index spoken */
 #define	CTRL_io_priority	0x0c00	/*   change i/o priority */
 #define	CTRL_free_mem		0x0d00	/*   get free paragraphs on module */
-#define	CTRL_get_lang		0x0e00	/* return bit mask of loaded
-					         * languages
-					         */
+#define	CTRL_get_lang		0x0e00	/* return bitmask of loaded languages */
 #define	CMD_test			0x2000		/* self-test request */
 #define	TEST_mask		0x0F00	/* isolate test field */
 #define	TEST_null		0x0000	/* no test requested */
Signature · 1 line
2.9.3
maintainer
#1 lore raw
Quoted 14 lines · Michael Mera

Remove unecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/speakup/speakup_decpc.c +0 -0
index 6bf38e49a96d..94ca6987f71b 100644

drivers/staging/speakup/speakup_decpc.c line 87

Quoted 7 lines
drivers/staging/speakup/speakup_decpc.c +1 -3
@@ -84,9 +84,7 @@
 #define	CTRL_last_index		0x0b00	/*   get last index spoken */
 #define	CTRL_io_priority	0x0c00	/*   change i/o priority */
 #define	CTRL_free_mem		0x0d00	/*   get free paragraphs on module */
-#define	CTRL_get_lang		0x0e00	/* return bit mask of loaded
-					         * languages
-					         */
+#define	CTRL_get_lang		0x0e00	/* return bitmask of loaded languages */

And now you have a different coding style warning :(

Sorry, you can't replace one for another.

greg k-h

author
#2 lore raw

PATCH v2 1/1 staging: speakup: fix wrong code indent

Remove unnecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/speakup/speakup_decpc.c +1 -3
index 6bf38e49a96d..94ca6987f71b 100644
@@ -84,9 +84,7 @@
 #define	CTRL_last_index		0x0b00	/*   get last index spoken */
 #define	CTRL_io_priority	0x0c00	/*   change i/o priority */
 #define	CTRL_free_mem		0x0d00	/*   get free paragraphs on module */
-#define	CTRL_get_lang		0x0e00	/* return bit mask of loaded
-					         * languages
-					         */
+#define	CTRL_get_lang		0x0e00	/* return bitmask of loaded languages */
 #define	CMD_test			0x2000		/* self-test request */
 #define	TEST_mask		0x0F00	/* isolate test field */
 #define	TEST_null		0x0000	/* no test requested */
Signature · 1 line
2.9.3
maintainer
#3 lore raw
Quoted 8 lines · Michael Mera

Remove unnecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

What changed from v1? That needs to go below the --- line.

And I think my previous email still is relevant here...

author
#4 lore raw
Quoted 11 lines · Greg Kroah-Hartman
Quoted 8 lines · Michael Mera

Remove unnecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

What changed from v1? That needs to go below the --- line.

Oh. Sorry. I fixed the spelling of the patch message, since I though that was the problem you detected but...

Quoted 2 lines

And I think my previous email still is relevant here...

... apparently not. I double checked the patch with 'checkpatch --strict' and it does not detect any problem this time.

Sorry if I missed something obvious, I am quite new to this, but could you give me some additional hint about the problem.

maintainer
#5 lore raw
Quoted 18 lines · Michael Mera
Quoted 11 lines · Greg Kroah-Hartman
Quoted 8 lines · Michael Mera

Remove unnecessary multiline comment, fixes checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Signed-off-by Michael Mera <[email protected]>
---
 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

What changed from v1? That needs to go below the --- line.

Oh. Sorry. I fixed the spelling of the patch message, since I though that was the problem you detected but...

Quoted 1 line
Quoted 7 lines
Quoted 1 line

And I think my previous email still is relevant here...

... apparently not. I double checked the patch with 'checkpatch --strict' and it does not detect any problem this time.

Sorry if I missed something obvious, I am quite new to this, but could you give me some additional hint about the problem.

Isn't the line now too long?

Anyway, please resend with at least the properly version information.

thanks,

greg k-h

author
#6 lore raw

PATCH v3 1/1 staging: speakup: fix wrong code indent

Fix checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Changes:
- replace unnecessary multiline comment by a single line comment
- change "bit mask" for "bitmask" to have a line shorter than 80 characters

Signed-off-by Michael Mera <[email protected]>

---

v2 -> v3:
- add missing changes descriptions
- improve patch message to make it more clear what changed

v1 -> v2:
- fix typo in patch description message

 drivers/staging/speakup/speakup_decpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/speakup/speakup_decpc.c +1 -3
index 6bf38e49a96d..94ca6987f71b 100644
@@ -84,9 +84,7 @@
 #define	CTRL_last_index		0x0b00	/*   get last index spoken */
 #define	CTRL_io_priority	0x0c00	/*   change i/o priority */
 #define	CTRL_free_mem		0x0d00	/*   get free paragraphs on module */
-#define	CTRL_get_lang		0x0e00	/* return bit mask of loaded
-					         * languages
-					         */
+#define	CTRL_get_lang		0x0e00	/* return bitmask of loaded languages */
 #define	CMD_test			0x2000		/* self-test request */
 #define	TEST_mask		0x0F00	/* isolate test field */
 #define	TEST_null		0x0000	/* no test requested */
Signature · 1 line
2.9.3
maintainer
#7 lore raw
Quoted 9 lines · Michael Mera

Fix checkpatch messages:
ERROR: code indent should use tabs where possible
WARNING: Block comments should align the * on each line

Changes:
- replace unnecessary multiline comment by a single line comment
- change "bit mask" for "bitmask" to have a line shorter than 80 characters

Quoted 6 lines
Signed-off-by Michael Mera <[email protected]>

---

v2 -> v3:
- add missing changes descriptions
- improve patch message to make it more clear what changed

This patch doesn't apply to my tree at all, what tree/branch did you make it against?

thanks,

greg k-h

author
#8 lore raw
Quoted 4 lines · Greg Kroah-Hartman

This patch doesn't apply to my tree at all, what tree/branch did you make it against?

From the 'T:' line in MAINTAINER at STAGING SUBSYSTEM, I thought that I

should base changes on:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Since there was no branch indication unlike some other lines, I worked on master.

Now, given your remark I found your blog post where you ask to base the changes on linux-next. Sorry.

Part of the patch is still relevant, so I intend to submit a v4. If that is ok with you.

Thank you,
Michael Mera

author
#9 lore raw

PATCH v4 1/1 staging: speakup: fix unnecessary long line

Fix checkpatch message:
WARNING: line over 80 characters

Change "bit mask" for "bitmask" to have a line shorter than 80 characters.

Signed-off-by Michael Mera <[email protected]>

---

v3 -> v4:
- base changes on linux-next rather than some random tree
- reduce scope of the patch (already partially solved)
- adapted message accordingly

v2 -> v3:
- add missing changes descriptions
- improve patch message to make it more clear what changed

v1 -> v2:
- fix typo in patch description message

 drivers/staging/speakup/speakup_decpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/speakup/speakup_decpc.c +1 -1
index 5d22c3b7edd4..7a8df7dc1e38 100644
@@ -84,7 +84,7 @@
 #define	CTRL_last_index		0x0b00	/* get last index spoken */
 #define	CTRL_io_priority	0x0c00	/* change i/o priority */
 #define	CTRL_free_mem		0x0d00	/* get free paragraphs on module */
-#define	CTRL_get_lang		0x0e00	/* return bit mask of loaded languages */
+#define	CTRL_get_lang		0x0e00	/* return bitmask of loaded languages */
 #define	CMD_test		0x2000	/* self-test request */
 #define	TEST_mask		0x0F00	/* isolate test field */
 #define	TEST_null		0x0000	/* no test requested */
Signature · 1 line
2.9.3