staging: ft1000: Use memset instead looping with for.
PATCH 1/3 staging: ft1000: Use memset instead looping with for.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +1 -4
@@ -874,10 +874,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) pInfo->fCondResetPend =0 ; pInfo->usbboot =0 ; pInfo->dspalive =0 ; -for (i=0 ;i<32 ;i++ ) - { - pInfo->tempbuf[i] =0 ; - } +memset (&pInfo->tempbuf[0 ],0 ,sizeof (pInfo->tempbuf));INIT_LIST_HEAD (&pInfo->prov_list);
Signature · 1 line
1.7.1
PATCH 2/3 staging: ft1000: Remove dead code.
Remove functions which was used nowhere. Also remove dead variables used by this functions.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 199 ------------------------ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 1 - drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 3 - 3 files changed, 0 insertions(+), 203 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +0 -199
@@ -45,33 +45,6 @@ static unsigned long gCardIndex;#define MAX_RCV_LOOP 100 -/**************************************************************** -* ft1000_control_complete -****************************************************************/ -static void ft1000_control_complete (struct urb *urb) -{ -struct ft1000_device *ft1000dev = (struct ft1000_device *)urb->context; - -//DEBUG("FT1000_CONTROL_COMPLETE ENTERED\n"); -if (ft1000dev ==NULL ) - { -DEBUG ("NULL ft1000dev, failure\n" ); -return ; - } -else if ( ft1000dev->dev ==NULL ) - { -DEBUG ("NULL ft1000dev->dev, failure\n" ); -return ; - } - -if (waitqueue_active (&ft1000dev->control_wait)) - { -wake_up (&ft1000dev->control_wait); - } - -//DEBUG("FT1000_CONTROL_COMPLETE RETURNED\n"); -} -//--------------------------------------------------------------------------- // Function: ft1000_control //
@@ -1023,178 +996,6 @@ static void ft1000_usb_transmit_complete(struct urb *urb)//DEBUG("Return from ft1000_usb_transmit_complete\n"); } - -/**************************************************************** -* ft1000_control -****************************************************************/ -static int ft1000_read_fifo_reg (struct ft1000_device *ft1000dev,unsigned int pipe, -u8 request, -u8 requesttype, -u16 value, -u16 index, -void *data, -u16 size, -int timeout) -{ -u16 ret; - -DECLARE_WAITQUEUE (wait, current); -struct urb *urb; -struct usb_ctrlrequest *dr; -int status; - -if (ft1000dev ==NULL ) - { -DEBUG ("NULL ft1000dev, failure\n" ); -return STATUS_FAILURE ; - } -else if ( ft1000dev->dev ==NULL ) - { -DEBUG ("NULL ft1000dev->dev, failure\n" ); -return STATUS_FAILURE ; - } - -spin_lock (&ft1000dev->device_lock); - -if (in_interrupt ()) - { -spin_unlock (&ft1000dev->device_lock); -return -EBUSY ; - } - - urb =usb_alloc_urb (0 ,GFP_KERNEL ); - dr =kmalloc (sizeof (struct usb_ctrlrequest ),in_interrupt () ?GFP_ATOMIC :GFP_KERNEL ); - -if (!urb || !dr) - { -kfree (dr); -usb_free_urb (urb); -spin_unlock (&ft1000dev->device_lock); -return -ENOMEM ; - } - - - - dr->bRequestType = requesttype; - dr->bRequest = request; - dr->wValue = value; - dr->wIndex = index; - dr->wLength = size; - -usb_fill_control_urb (urb, ft1000dev->dev, pipe, (char *)dr, (void *)data, size, (void *)ft1000_control_complete, (void *)ft1000dev); - - -init_waitqueue_head (&ft1000dev->control_wait); - -set_current_state (TASK_INTERRUPTIBLE ); - -add_wait_queue (&ft1000dev->control_wait, &wait); - - - - - status =usb_submit_urb (urb,GFP_KERNEL ); - -if (status) - { -usb_free_urb (urb); -kfree (dr); -remove_wait_queue (&ft1000dev->control_wait, &wait); -spin_unlock (&ft1000dev->device_lock); -return status; - } - -if (urb->status == -EINPROGRESS ) - { -while (timeout && urb->status == -EINPROGRESS ) - { - status = timeout =schedule_timeout (timeout); - } - } -else - { - status =1 ; - } - -remove_wait_queue (&ft1000dev->control_wait, &wait); - -if (!status) - { -usb_unlink_urb (urb); -printk ("ft1000 timeout\n" ); - status = -ETIMEDOUT ; - } -else - { - status = urb->status; - -if (urb->status) - { -printk ("ft1000 control message failed (urb addr: %p) with error number: %i\n" , urb, (int )status); - -usb_clear_halt (ft1000dev->dev,usb_rcvctrlpipe (ft1000dev->dev,0 )); -usb_clear_halt (ft1000dev->dev,usb_sndctrlpipe (ft1000dev->dev,0 )); -usb_unlink_urb (urb); - } - } - - - -usb_free_urb (urb); -kfree (dr); -spin_unlock (&ft1000dev->device_lock); -return ret; - - -} - -//--------------------------------------------------------------------------- -// Function: ft1000_read_fifo_len -// -// Parameters: ft1000dev - device structure -// -// -// Returns: none -// -// Description: read the fifo length register content -// -// Notes: -// -//--------------------------------------------------------------------------- -static inline u16 ft1000_read_fifo_len (struct net_device *dev) -{ -u16 temp; -u16 ret; - -struct ft1000_info *info = (struct ft1000_info *)netdev_priv (dev); -struct ft1000_device *ft1000dev = info->pFt1000Dev; -// DEBUG("ft1000_read_fifo_len: enter ft1000dev %x\n", ft1000dev); //aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct ft1000_device *??? -DEBUG ("ft1000_read_fifo_len: enter ft1000dev %p\n" , ft1000dev);//aelias [+] reason: up - - ret =STATUS_SUCCESS ; - - ret =ft1000_read_fifo_reg (ft1000dev, -usb_rcvctrlpipe (ft1000dev->dev,0 ), -HARLEY_READ_REGISTER , -HARLEY_READ_OPERATION , -0 , -FT1000_REG_MAG_UFSR , - &temp, -2 , -LARGE_TIMEOUT ); - -if (ret>0 ) - ret =STATUS_SUCCESS ; -else - ret =STATUS_FAILURE ; - -DEBUG ("ft1000_read_fifo_len: returned %d\n" , temp); - -return (temp-16 ); - -} - -//--------------------------------------------------------------------------- // // Function: ft1000_copy_down_pkt
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +0 -1
@@ -84,7 +84,6 @@ static int ft1000_probe(struct usb_interface *interface, ft1000dev->dev = dev; ft1000dev->status =0 ; ft1000dev->net =NULL ; -spin_lock_init (&ft1000dev->device_lock); ft1000dev->tx_urb =usb_alloc_urb (0 ,GFP_ATOMIC ); ft1000dev->rx_urb =usb_alloc_urb (0 ,GFP_ATOMIC );
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +0 -3
@@ -466,12 +466,9 @@ struct ft1000_device {struct usb_device *dev;struct net_device *net; -spinlock_t device_lock;u32 status; -wait_queue_head_t control_wait; -struct urb *rx_urb;struct urb *tx_urb;
Signature · 1 line
1.7.1
PATCH 3/3 staging: ft1000: Pseudo header handlig improved.
In reply to Marek BeliskoHandling for pseudo header was done by directly copying data to tx buffer. This hide a functionality and make code unreadable.
Use approach where fill pseudo_hdr structure first with data and then copy to beginning of buffer.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 35 ++++++++++++------------- 1 files changed, 17 insertions(+), 18 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +17 -18
@@ -1017,10 +1017,9 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev; -int i, count, ret; -USHORT *pTemp; -USHORT checksum; +int count, ret;u8 *t; +struct pseudo_hdr hdr;if (!pInfo->CardReady) {
@@ -1044,21 +1043,21 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)if ( count %4 ) count = count + (4 - (count %4 ) ); - pTemp = (PUSHORT )&(pFt1000Dev->tx_buf[0 ]); - *pTemp ++ =ntohs (count); - *pTemp ++ =0x1020 ; - *pTemp ++ =0x2010 ; - *pTemp ++ =0x9100 ; - *pTemp ++ =0 ; - *pTemp ++ =0 ; - *pTemp ++ =0 ; - pTemp = (PUSHORT )&(pFt1000Dev->tx_buf[0 ]); - checksum = *pTemp ++; -for (i=1 ; i<7 ; i++) - { - checksum ^= *pTemp ++; - } - *pTemp++ = checksum; +memset (&hdr,0 ,sizeof (struct pseudo_hdr )); + + hdr.length =ntohs (count); + hdr.source =0x10 ; + hdr.destination =0x20 ; + hdr.portdest =0x20 ; + hdr.portsrc =0x10 ; + hdr.sh_str_id =0x91 ; + hdr.control =0x00 ; + + hdr.checksum = hdr.length ^ hdr.source ^ hdr.destination ^ + 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);
Signature · 1 line
1.7.1