[PATCH v2 0/2] checkpatch fixes

[PATCH v2 0/2] checkpatch fixes

[Peter Karlsson]

This patch set includes 2 patches fixing checkpatch warnings about
lines over 80 characters.

Changes since v1:
* Split table lines on 8 bytes instead of 7.
* Better commit message. 

Peter Karlsson (2):
  staging: ft1000-usb: fixed table alignment
  staging: ft1000-usb: shorten lines to under 80 characters

 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 31 +++++++++++++++-------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    | 21 ++++++++++-----
 2 files changed, 35 insertions(+), 17 deletions(-)

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/2] staging: ft1000-usb: fixed table alignment

[Peter Karlsson]

Fixed alignment to 8 bytes per line.

Signed-off-by: Peter Karlsson <peter@zapto.se>
---
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index faac4e5..b917953 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -414,12 +414,19 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
 	unsigned long flags;
 	struct IOCTL_GET_VER get_ver_data;
 	struct IOCTL_GET_DSP_STAT get_stat_data;
-	u8 ConnectionMsg[] = {0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64,
-			      0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0a,
-			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			      0x00, 0x00, 0x02, 0x37, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x7f, 0x00,
-			      0x00, 0x01, 0x00, 0x00};
+	u8 ConnectionMsg[] = {
+		0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64,
+		0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0a,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x02, 0x37, 0x00, 0x00, 0x00, 0x08,
+		0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x7f, 0x00,
+		0x00, 0x01, 0x00, 0x00
+	};
 
 	unsigned short ledStat = 0;
 	unsigned short conStat = 0;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2] staging: ft1000-usb: shorten lines to under 80 characters

[Peter Karlsson]

Wrap function arguments to shorten lines to under 80 characters.

Signed-off-by: Peter Karlsson <peter@zapto.se>
---
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c    | 12 ++++++++----
 drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 21 ++++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index b917953..be5ddb4 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -260,7 +260,8 @@ void ft1000_destroy_dev(struct net_device *netdev)
 		/* Make sure we free any memory reserve for slow Queue */
 		for (i = 0; i < MAX_NUM_APP; i++) {
 			while (list_empty(&dev->app_info[i].app_sqlist) == 0) {
-				pdpram_blk = list_entry(dev->app_info[i].app_sqlist.next, struct dpram_blk, list);
+				pdpram_blk = list_entry(dev->app_info[i].app_sqlist.next,
+							struct dpram_blk, list);
 				list_del(&pdpram_blk->list);
 				ft1000_free_buffer(pdpram_blk, &freercvpool);
 
@@ -501,10 +502,12 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
 		memcpy(get_stat_data.eui64, info->eui64, EUISZ);
 
 		if (info->ProgConStat != 0xFF) {
-			ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_LED, (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX);
+			ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_LED,
+					    (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX);
 			get_stat_data.LedStat = ntohs(ledStat);
 			pr_debug("LedStat = 0x%x\n", get_stat_data.LedStat);
-			ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
+			ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE,
+					    (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
 			get_stat_data.ConStat = ntohs(conStat);
 			pr_debug("ConStat = 0x%x\n", get_stat_data.ConStat);
 		} else {
@@ -694,7 +697,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
 		if (list_empty(&ft1000dev->app_info[i].app_sqlist) == 0) {
 			/* pr_debug("Message detected in slow queue\n"); */
 			spin_lock_irqsave(&free_buff_lock, flags);
-			pdpram_blk = list_entry(ft1000dev->app_info[i].app_sqlist.next, struct dpram_blk, list);
+			pdpram_blk = list_entry(ft1000dev->app_info[i].app_sqlist.next,
+						struct dpram_blk, list);
 			list_del(&pdpram_blk->list);
 			ft1000dev->app_info[i].NumOfMsg--;
 			/* pr_debug("NumOfMsg for app %d = %d\n", i, ft1000dev->app_info[i].NumOfMsg); */
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 5def347..a72511c 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -180,7 +180,8 @@ static u16 get_handshake(struct ft1000_usb *ft1000dev, u16 expected_value)
 		}
 
 		status = ft1000_read_dpram16(ft1000dev,
-					     DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
+					     DWNLD_MAG1_HANDSHAKE_LOC,
+					     (u8 *)&handshake, 1);
 		handshake = ntohs(handshake);
 
 		if (status)
@@ -281,12 +282,14 @@ static u16 get_request_type(struct ft1000_usb *ft1000dev)
 
 	if (ft1000dev->bootmode == 1) {
 		status = fix_ft1000_read_dpram32(ft1000dev,
-						 DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
+						 DWNLD_MAG1_TYPE_LOC,
+						 (u8 *)&tempx);
 		tempx = ntohl(tempx);
 	} else {
 		tempx = 0;
 		status = ft1000_read_dpram16(ft1000dev,
-					     DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1);
+					     DWNLD_MAG1_TYPE_LOC,
+					     (u8 *)&tempword, 1);
 		tempx |= (tempword << 16);
 		tempx = ntohl(tempx);
 	}
@@ -304,7 +307,8 @@ static u16 get_request_type_usb(struct ft1000_usb *ft1000dev)
 
 	if (ft1000dev->bootmode == 1) {
 		status = fix_ft1000_read_dpram32(ft1000dev,
-						 DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
+						 DWNLD_MAG1_TYPE_LOC,
+						 (u8 *)&tempx);
 		tempx = ntohl(tempx);
 	} else {
 		if (ft1000dev->usbboot == 2) {
@@ -332,14 +336,17 @@ static long get_request_value(struct ft1000_usb *ft1000dev)
 
 	if (ft1000dev->bootmode == 1) {
 		status = fix_ft1000_read_dpram32(ft1000dev,
-						 DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
+						 DWNLD_MAG1_SIZE_LOC,
+						 (u8 *)&value);
 		value = ntohl(value);
 	} else	{
 		status = ft1000_read_dpram16(ft1000dev,
-					     DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
+					     DWNLD_MAG1_SIZE_LOC,
+					     (u8 *)&tempword, 0);
 		value = tempword;
 		status = ft1000_read_dpram16(ft1000dev,
-					     DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
+					     DWNLD_MAG1_SIZE_LOC,
+					     (u8 *)&tempword, 1);
 		value |= (tempword << 16);
 		value = ntohl(value);
 	}
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/2] staging: ft1000-usb: fixed table alignment

[Sudip Mukherjee]

On Sun, Jun 21, 2015 at 01:29:50PM +0200, Peter Karlsson wrote:
> Fixed alignment to 8 bytes per line.
> 
> Signed-off-by: Peter Karlsson <peter@zapto.se>
> ---
>  drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> index faac4e5..b917953 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> @@ -414,12 +414,19 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
>  	unsigned long flags;
I am little bit confused with this patch. It is not applying. On
verification I am seeing struct timeval tv; is supposed to here.
have you verified that the patch is applying?

regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

staging patch not in staging tree (was: Re: [PATCH 1/2] staging: ft1000-usb: fixed table alignment)

[Sudip Mukherjee]

On Mon, Jun 22, 2015 at 07:06:49PM +0530, Sudip Mukherjee wrote:
> On Mon, Jun 22, 2015 at 03:02:37PM +0200, Peter Karlsson wrote:
> > On 2015-06-22 06:29, Sudip Mukherjee wrote:
> > > which tree have you been using?
> > > Greg will have three staging tree, use staging-testing
> > 
> > I have used linux-next tree :/
> well, I am now confused why linux-next is not having this struct.
> at line 415 of drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> struct timeval tv; is there in staging-next. And today's linux-next
> has merged staging-next. Then how that struct timeval is not there in
> linux-next ?

I was doing a bisect to see why the files are differing in staging-next
and linux-next. And it turns out to be:
8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t")

which didn't go through the staging tree.

regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

Re: staging patch not in staging tree (was: Re: [PATCH 1/2] staging: ft1000-usb: fixed table alignment)

[Dan Carpenter]

On Tue, Jun 23, 2015 at 11:03:34AM +0530, Sudip Mukherjee wrote:
> On Mon, Jun 22, 2015 at 07:06:49PM +0530, Sudip Mukherjee wrote:
> > On Mon, Jun 22, 2015 at 03:02:37PM +0200, Peter Karlsson wrote:
> > > On 2015-06-22 06:29, Sudip Mukherjee wrote:
> > > > which tree have you been using?
> > > > Greg will have three staging tree, use staging-testing
> > > 
> > > I have used linux-next tree :/
> > well, I am now confused why linux-next is not having this struct.
> > at line 415 of drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> > struct timeval tv; is there in staging-next. And today's linux-next
> > has merged staging-next. Then how that struct timeval is not there in
> > linux-next ?
> 
> I was doing a bisect to see why the files are differing in staging-next
> and linux-next. And it turns out to be:
> 8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t")
> 
> which didn't go through the staging tree.
> 

It's going through Arnd's tree since he does time stuff.  He should have
sent it for an Ack or something.  Maybe he is planning to do that later.

The patch is very old.

Not a big deal?

regards,
dan carpenter

Re: staging patch not in staging tree (was: Re: [PATCH 1/2] staging: ft1000-usb: fixed table alignment)

[Sudip Mukherjee]

On Tue, Jun 23, 2015 at 11:05:47AM +0300, Dan Carpenter wrote:
> On Tue, Jun 23, 2015 at 11:03:34AM +0530, Sudip Mukherjee wrote:
> > On Mon, Jun 22, 2015 at 07:06:49PM +0530, Sudip Mukherjee wrote:
> > > On Mon, Jun 22, 2015 at 03:02:37PM +0200, Peter Karlsson wrote:
> > > > On 2015-06-22 06:29, Sudip Mukherjee wrote:
> > > > > which tree have you been using?
> > > > > Greg will have three staging tree, use staging-testing
> > > > 
> > > > I have used linux-next tree :/
> > > well, I am now confused why linux-next is not having this struct.
> > > at line 415 of drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> > > struct timeval tv; is there in staging-next. And today's linux-next
> > > has merged staging-next. Then how that struct timeval is not there in
> > > linux-next ?
> > 
> > I was doing a bisect to see why the files are differing in staging-next
> > and linux-next. And it turns out to be:
> > 8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t")
> > 
> > which didn't go through the staging tree.
> > 
> 
> It's going through Arnd's tree since he does time stuff.  He should have
> sent it for an Ack or something.  Maybe he is planning to do that later.
> 
> The patch is very old.
> 
> Not a big deal?
there was no patch in ft1000 so its not a big deal. But will it not be
merge conflict when Linus tries to merge staging tree and Arnd's tree?

regards
sudip