Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74827f8d authored by Kelley Nielsen's avatar Kelley Nielsen Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: style issues fixed in write_blk 



function write_blk, in ft1000_download.c, contains many coding style
issues. It has indentations of 3 spaces, long lines, C99 comments, and
extra whitespace. It also has a return type of u32, and changing the
returned variable in the function triggers a checkpatch leading spaces
warning. Indentation should be fixed throughout the file for
consistency.

This patch fixes those issues, in preparation for correcting the status
return type throughout the file. The variable Status has been changed
from u32 to int and renamed status.

Signed-off-by: default avatarKelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb2ec639

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

+57 −66
Original line number Diff line number Diff line
@@ -450,35 +450,32 @@ static int write_dpram32_and_check(struct ft1000_usb *ft1000dev, 
 *              u8  **pUcFile - DSP image file pointer in u8

 *              long word_length - length of the buffer to be written to DPRAM

 */

static u32 write_blk (struct ft1000_usb *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)

static int write_blk(struct ft1000_usb *ft1000dev, u16 **pUsFile, u8 **pUcFile,

		long word_length)

{

   u32 Status = STATUS_SUCCESS;

	int status = STATUS_SUCCESS;

	u16 dpram;

	int loopcnt, i;

	u16 tempword;

	u16 tempbuffer[64];



   //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length);

	/*DEBUG("FT1000:download:start word_length = %d\n",(int)word_length); */

	dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;

	tempword = *(*pUsFile);

	(*pUsFile)++;

   Status = ft1000_write_dpram16(ft1000dev, dpram, tempword, 0);

	status = ft1000_write_dpram16(ft1000dev, dpram, tempword, 0);

	tempword = *(*pUsFile);

	(*pUsFile)++;

   Status = ft1000_write_dpram16(ft1000dev, dpram++, tempword, 1);

	status = ft1000_write_dpram16(ft1000dev, dpram++, tempword, 1);



	*pUcFile = *pUcFile + 4;

	word_length--;

	tempword = (u16)word_length;

	word_length = (word_length / 16) + 1;

   for (; word_length > 0; word_length--) /* In words */

   {

	for (; word_length > 0; word_length--) { /* In words */

		loopcnt = 0;



	      for (i=0; i<32; i++)

	      {

		       if (tempword != 0)

		       {

		for (i = 0; i < 32; i++) {

			if (tempword != 0) {

				tempbuffer[i++] = *(*pUsFile);

				(*pUsFile)++;

				tempbuffer[i] = *(*pUsFile);
@@ -486,39 +483,33 @@ static u32 write_blk (struct ft1000_usb *ft1000dev, u16 **pUsFile, u8 **pUcFile, 
				*pUcFile = *pUcFile + 4;

				loopcnt++;

				tempword--;

		       }

		       else

		       {

			} else {

				tempbuffer[i++] = 0;

				tempbuffer[i] = 0;

			}

		}



              //DEBUG("write_blk: loopcnt is %d\n", loopcnt);

              //DEBUG("write_blk: bootmode = %d\n", bootmode);

              //DEBUG("write_blk: dpram = %x\n", dpram);

	      if (ft1000dev->bootmode == 0)

	      {

		/*DEBUG("write_blk: loopcnt is %d\n", loopcnt); */

		/*DEBUG("write_blk: bootmode = %d\n", bootmode); */

		/*DEBUG("write_blk: dpram = %x\n", dpram); */

		if (ft1000dev->bootmode == 0) {

			if (dpram >= 0x3F4)

                     Status = ft1000_write_dpram32 (ft1000dev, dpram, (u8 *)&tempbuffer[0], 8);

	         else

                    Status = ft1000_write_dpram32 (ft1000dev, dpram, (u8 *)&tempbuffer[0], 64);

	      }

				status = ft1000_write_dpram32(ft1000dev, dpram,

						(u8 *)&tempbuffer[0], 8);

			else

	      {

		      Status = write_dpram32_and_check(ft1000dev, tempbuffer,

				status = ft1000_write_dpram32(ft1000dev, dpram,

						(u8 *)&tempbuffer[0], 64);

		} else {

			status = write_dpram32_and_check(ft1000dev, tempbuffer,

					dpram);

		if (Status != STATUS_SUCCESS)

		{

			if (status != STATUS_SUCCESS) {

				DEBUG("FT1000:download:Write failed tempbuffer[31] = 0x%x\n", tempbuffer[31]);

				break;

			}



		}

		dpram = dpram + loopcnt;

	}



   return Status;

	return status;

}



static void usb_dnld_complete (struct urb *urb)