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 4/5] staging: ft1000: Fix coding style in write_blk_fifo() function.
Date: Wed, 26 Jan 2011 12:49:14 +0100 [thread overview]
Message-ID: <1296042555-29145-4-git-send-email-marek.belisko@open-nandra.com> (raw)
In-Reply-To: <1296042555-29145-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 | 56 +++++++++----------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 2537a11..1e12c41 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -639,44 +639,42 @@ static void usb_dnld_complete (struct urb *urb)
// Notes:
//
//---------------------------------------------------------------------------
-static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
+static u32 write_blk_fifo(struct ft1000_device *ft1000dev, u16 **pUsFile,
+ u8 **pUcFile, long word_length)
{
- u32 Status = STATUS_SUCCESS;
- int byte_length;
- long aligncnt;
-
- byte_length = word_length * 4;
+ u32 Status = STATUS_SUCCESS;
+ int byte_length;
+ long aligncnt;
- if (byte_length % 4)
- aligncnt = 4 - (byte_length % 4);
- else
- aligncnt = 0;
- byte_length += aligncnt;
+ byte_length = word_length * 4;
- if (byte_length && ((byte_length % 64) == 0)) {
- byte_length += 4;
- }
+ if (byte_length % 4)
+ aligncnt = 4 - (byte_length % 4);
+ else
+ aligncnt = 0;
+ byte_length += aligncnt;
- if (byte_length < 64)
- byte_length = 68;
+ if (byte_length && ((byte_length % 64) == 0))
+ byte_length += 4;
+ if (byte_length < 64)
+ byte_length = 68;
- usb_init_urb(ft1000dev->tx_urb);
- memcpy (ft1000dev->tx_buf, *pUcFile, byte_length);
- usb_fill_bulk_urb(ft1000dev->tx_urb,
- ft1000dev->dev,
- usb_sndbulkpipe(ft1000dev->dev, ft1000dev->bulk_out_endpointAddr),
- ft1000dev->tx_buf,
- byte_length,
- usb_dnld_complete,
- (void*)ft1000dev);
+ usb_init_urb(ft1000dev->tx_urb);
+ memcpy(ft1000dev->tx_buf, *pUcFile, byte_length);
+ usb_fill_bulk_urb(ft1000dev->tx_urb,
+ ft1000dev->dev,
+ usb_sndbulkpipe(ft1000dev->dev,
+ ft1000dev->bulk_out_endpointAddr),
+ ft1000dev->tx_buf, byte_length, usb_dnld_complete,
+ (void *)ft1000dev);
- usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC);
+ usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC);
- *pUsFile = *pUsFile + (word_length << 1);
- *pUcFile = *pUcFile + (word_length << 2);
+ *pUsFile = *pUsFile + (word_length << 1);
+ *pUcFile = *pUcFile + (word_length << 2);
- return Status;
+ return Status;
}
//---------------------------------------------------------------------------
--
1.7.1
next prev parent reply other threads:[~2011-01-26 11:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-26 11:49 [PATCH 1/5] staging: ft1000: Remove unused variables Marek Belisko
2011-01-26 11:49 ` [PATCH 2/5] staging: ft1000: Remove unnecessary assignment Marek Belisko
2011-01-26 11:49 ` [PATCH 3/5] staging: ft1000: Create common function for buffers check Marek Belisko
2011-01-26 11:49 ` Marek Belisko [this message]
2011-01-26 13:07 ` [PATCH 4/5] staging: ft1000: Fix coding style in write_blk_fifo() function Dan Carpenter
2011-01-26 13:34 ` Belisko Marek
2011-01-26 13:43 ` Dan Carpenter
2011-01-26 13:56 ` Belisko Marek
2011-01-26 14:30 ` Dan Carpenter
2011-02-08 13:40 ` Belisko Marek
2011-02-08 16:35 ` Dan Carpenter
2011-02-09 8:27 ` Belisko Marek
2011-02-09 10:07 ` Belisko Marek
2011-02-09 11:08 ` Dan Carpenter
2011-02-09 11:16 ` Belisko Marek
2011-01-26 11:49 ` [PATCH 5/5] staging: ft1000: Fix indentation in scram_dnldr() function Marek Belisko
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=1296042555-29145-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®