Commit d4216b30 authored by Peter Karlsson's avatar Peter Karlsson Committed by Greg Kroah-Hartman
Browse files

staging: ft1000-usb: shorten lines to under 80 characters 



Wrap function arguments to shorten lines to under 80 characters.

Signed-off-by: default avatarPeter Karlsson <peter@zapto.se>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ccd8ebb

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c

+8 −4
Original line number Diff line number Diff line
@@ -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);
@@ -502,10 +503,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 {
@@ -696,7 +699,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); */

drivers/staging/ft1000/ft1000-usb/ft1000_download.c

+14 −7
Original line number Diff line number Diff line
@@ -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);

	}