lkml.org 
[lkml]   [2011]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 12/21] staging: ft1000: Fix coding style in ft1000_copy_down_pkt function.
Date
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 75 +++++++++++-------------
1 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 958292e..bb1e9d6 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -929,37 +929,31 @@ static void ft1000_usb_transmit_complete(struct urb *urb)
// SUCCESS
//
//---------------------------------------------------------------------------
-static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)
+static int ft1000_copy_down_pkt(struct net_device *netdev, u8 * packet, u16 len)
{
struct ft1000_info *pInfo = netdev_priv(netdev);
- struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev;
-
+ struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev;

int count, ret;
- u8 *t;
+ u8 *t;
struct pseudo_hdr hdr;

- if (!pInfo->CardReady)
- {
-
- DEBUG("ft1000_copy_down_pkt::Card Not Ready\n");
- return -ENODEV;
-
- }
-
+ if (!pInfo->CardReady) {
+ DEBUG("ft1000_copy_down_pkt::Card Not Ready\n");
+ return -ENODEV;
+ }

- //DEBUG("ft1000_copy_down_pkt() entered, len = %d\n", len);
+ //DEBUG("ft1000_copy_down_pkt() entered, len = %d\n", len);

count = sizeof(struct pseudo_hdr) + len;
- if(count > MAX_BUF_SIZE)
- {
- DEBUG("Error:ft1000_copy_down_pkt:Message Size Overflow!\n");
- DEBUG("size = %d\n", count);
- return -EINVAL;
- }
+ if (count > MAX_BUF_SIZE) {
+ DEBUG("Error:ft1000_copy_down_pkt:Message Size Overflow!\n");
+ DEBUG("size = %d\n", count);
+ return -EINVAL;
+ }

- if ( count % 4)
- count = count + (4- (count %4) );
+ if (count % 4)
+ count = count + (4 - (count % 4));

memset(&hdr, 0, sizeof(struct pseudo_hdr));

@@ -972,46 +966,45 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)
hdr.control = 0x00;

hdr.checksum = hdr.length ^ hdr.source ^ hdr.destination ^
- hdr.portdest ^ hdr.portsrc ^ hdr.sh_str_id ^
- hdr.control;
+ hdr.portdest ^ hdr.portsrc ^ hdr.sh_str_id ^ hdr.control;

memcpy(&pFt1000Dev->tx_buf[0], &hdr, sizeof(hdr));
memcpy(&(pFt1000Dev->tx_buf[sizeof(struct pseudo_hdr)]), packet, len);

- netif_stop_queue(netdev);
-
- //DEBUG ("ft1000_copy_down_pkt: count = %d\n", count);
+ netif_stop_queue(netdev);

- usb_fill_bulk_urb(pFt1000Dev->tx_urb,
- pFt1000Dev->dev,
- usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr),
- pFt1000Dev->tx_buf,
- count,
- ft1000_usb_transmit_complete,
- (void*)pFt1000Dev);
+ //DEBUG ("ft1000_copy_down_pkt: count = %d\n", count);

- t = (u8 *)pFt1000Dev->tx_urb->transfer_buffer;
- //DEBUG("transfer_length=%d\n", pFt1000Dev->tx_urb->transfer_buffer_length);
- /*for (i=0; i<count; i++ )
- {
- DEBUG("%x ", *t++ );
- }*/
+ usb_fill_bulk_urb(pFt1000Dev->tx_urb,
+ pFt1000Dev->dev,
+ usb_sndbulkpipe(pFt1000Dev->dev,
+ pFt1000Dev->bulk_out_endpointAddr),
+ pFt1000Dev->tx_buf, count,
+ ft1000_usb_transmit_complete, (void *)pFt1000Dev);

+ t = (u8 *) pFt1000Dev->tx_urb->transfer_buffer;
+ //DEBUG("transfer_length=%d\n", pFt1000Dev->tx_urb->transfer_buffer_length);
+ /*for (i=0; i<count; i++ )
+ {
+ DEBUG("%x ", *t++ );
+ } */

ret = usb_submit_urb(pFt1000Dev->tx_urb, GFP_ATOMIC);
+
if (ret) {
DEBUG("ft1000 failed tx_urb %d\n", ret);
return ret;
} else {
pInfo->stats.tx_packets++;
- pInfo->stats.tx_bytes += (len+14);
+ pInfo->stats.tx_bytes += (len + 14);
}

- //DEBUG("ft1000_copy_down_pkt() exit\n");
+ //DEBUG("ft1000_copy_down_pkt() exit\n");

return 0;
}

+
//---------------------------------------------------------------------------
// Function: ft1000_start_xmit
//
--
1.7.1


\
 
 \ /
  Last update: 2011-03-10 11:57    [W:0.169 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site