All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Belisko <marek.belisko@open-nandra.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	Marek Belisko <marek.belisko@open-nandra.com>
Subject: [PATCH resend 08/12] staging: ft1000: Fix coding style in get_request_type_usb() function.
Date: Tue, 25 Jan 2011 12:31:19 +0100	[thread overview]
Message-ID: <1295955083-11086-8-git-send-email-marek.belisko@open-nandra.com> (raw)
In-Reply-To: <1295955083-11086-1-git-send-email-marek.belisko@open-nandra.com>

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |   48 +++++++++----------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index bf20e64..3b56661 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -364,34 +364,32 @@ static u16 get_request_type(struct ft1000_device *ft1000dev)
 
 static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
 {
-   u16   request_type;
-   u32    status;
-   u16   tempword;
-   u32    tempx;
+	u16   request_type;
+	u32    status;
+	u16   tempword;
+	u32    tempx;
 	struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
-   if ( pft1000info->bootmode == 1)
-   {
-       status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
-       tempx = ntohl(tempx);
-   }
-   else
-   {
-       if (pft1000info->usbboot == 2) {
-          tempx = pft1000info->tempbuf[2];
-          tempword = pft1000info->tempbuf[3];
-       }
-       else {
-          tempx = 0;
-          status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1);
-       }
-       tempx |= (tempword << 16);
-       tempx = ntohl(tempx);
-   }
-   request_type = (u16)tempx;
 
-   //DEBUG("get_request_type: request_type is %x\n", request_type);
-   return request_type;
+	if (pft1000info->bootmode == 1) {
+		status = fix_ft1000_read_dpram32(ft1000dev,
+				DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
+		tempx = ntohl(tempx);
+	} else {
+		if (pft1000info->usbboot == 2) {
+			tempx = pft1000info->tempbuf[2];
+			tempword = pft1000info->tempbuf[3];
+		} else {
+			tempx = 0;
+			status = ft1000_read_dpram16(ft1000dev,
+					DWNLD_MAG1_TYPE_LOC,
+					(u8 *)&tempword, 1);
+		}
+		tempx |= (tempword << 16);
+		tempx = ntohl(tempx);
+	}
+	request_type = (u16)tempx;
 
+	return request_type;
 }
 
 //---------------------------------------------------------------------------
-- 
1.7.1


  parent reply	other threads:[~2011-01-25 11:31 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-25 11:31 [PATCH resend 01/12] staging: ft1000: Use common return point Marek Belisko
2011-01-25 11:31 ` [PATCH resend 02/12] staging: ft1000: Remove dead code Marek Belisko
2011-01-25 11:31 ` [PATCH resend 03/12] staging: ft1000: Fix coding style in check_usb_db() function Marek Belisko
2011-01-25 11:31 ` [PATCH resend 04/12] staging: ft1000: Fix coding style in put_handshake() function Marek Belisko
2011-01-25 11:31 ` [PATCH resend 05/12] staging: ft1000: Fix coding style in get_handshake_usb() function Marek Belisko
2011-01-25 12:14   ` Dan Carpenter
2011-01-25 11:31 ` [PATCH resend 06/12] staging: ft1000: Fix coding style in put_handshake_usb() function Marek Belisko
2011-01-25 11:31 ` [PATCH resend 07/12] staging: ft1000: Fix coding style in get_request_type() function Marek Belisko
2011-01-25 12:23   ` Dan Carpenter
2011-01-25 11:31 ` Marek Belisko [this message]
2011-01-25 12:25   ` [PATCH resend 08/12] staging: ft1000: Fix coding style in get_request_type_usb() function Dan Carpenter
2011-01-25 11:31 ` [PATCH resend 09/12] staging: ft1000: Fix coding style in get_request_value() function Marek Belisko
2011-01-25 12:28   ` Dan Carpenter
2011-01-25 11:31 ` [PATCH resend 10/12] staging: ft1000: Fix coding style in put_request_value() function Marek Belisko
2011-01-25 11:31 ` [PATCH resend 11/12] staging: ft1000: Fix coding style in hdr_checksum() function Marek Belisko
2011-01-25 11:31 ` [PATCH resend 12/12] staging: ft1000: Fix coding style in get_handshake() function Marek Belisko
2011-01-25 12:04 ` [PATCH resend 01/12] staging: ft1000: Use common return point Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295955083-11086-8-git-send-email-marek.belisko@open-nandra.com \
    --to=marek.belisko@open-nandra.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.