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

Commit d7a7318b authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: Fix coding style in get_handshake() function. 



Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 78395f67

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

+37 −45
Original line number Diff line number Diff line
@@ -191,50 +191,42 @@ static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value) 
	struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);



	loopcnt = 0;

   while (loopcnt < 100)

   {



           // Need to clear downloader doorbell if Hartley ASIC

           status = ft1000_write_register (ft1000dev,  FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL);

           //DEBUG("FT1000:get_handshake:doorbell = 0x%x\n", temp);

               if (pft1000info->fcodeldr)

               {

                   DEBUG(" get_handshake: fcodeldr is %d\n", pft1000info->fcodeldr);

	while (loopcnt < 100) {

		/* Need to clear downloader doorbell if Hartley ASIC */

		status = ft1000_write_register(ft1000dev,  FT1000_DB_DNLD_RX,

						FT1000_REG_DOORBELL);

		if (pft1000info->fcodeldr) {

			DEBUG(" get_handshake: fcodeldr is %d\n",

				pft1000info->fcodeldr);

			pft1000info->fcodeldr = 0;

			status = check_usb_db(ft1000dev);

                   if (status != STATUS_SUCCESS)

                   {

			if (status != STATUS_SUCCESS) {

				DEBUG("get_handshake: check_usb_db failed\n");

				status = STATUS_FAILURE;

				break;

			}

                   status = ft1000_write_register (ft1000dev,  FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL);

			status = ft1000_write_register(ft1000dev,

					FT1000_DB_DNLD_RX,

					FT1000_REG_DOORBELL);

		}



                status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);

                //DEBUG("get_handshake: handshake is %x\n", tempx);

		status = ft1000_read_dpram16(ft1000dev,

				DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);

		handshake = ntohs(handshake);

                //DEBUG("get_handshake: after swap, handshake is %x\n", handshake);



		if (status)

			return HANDSHAKE_TIMEOUT_VALUE;



        //DEBUG("get_handshake: handshake= %x\n", handshake);

        if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB))

        {

            //DEBUG("get_handshake: return handshake %x\n", handshake);

		if ((handshake == expected_value) ||

		    (handshake == HANDSHAKE_RESET_VALUE_USB)) {

			return handshake;

        }

        else

        {

		} else	{

			loopcnt++;

			msleep(10);

		}

        //DEBUG("HANDSHKE LOOP: %d\n", loopcnt);



	}



   //DEBUG("get_handshake: return handshake time out\n");

	return HANDSHAKE_TIMEOUT_VALUE;

}