staging: ft1000: Use specific error codes instead self defined.
PATCH 1/4 staging: ft1000: Use specific error codes instead self defined.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 27 +++++++++--------------- 1 files changed, 10 insertions(+), 17 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +10 -17
@@ -1025,7 +1025,7 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len) {DEBUG ("ft1000_copy_down_pkt::Card Not Ready\n" ); -return STATUS_FAILURE ; +return -ENODEV ; }
@@ -1037,7 +1037,7 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len) {DEBUG ("Error:ft1000_copy_down_pkt:Message Size Overflow!\n" );DEBUG ("size = %d\n" , count); -return STATUS_FAILURE ; +return -EINVAL ; }if ( count %4 )
@@ -1080,25 +1080,18 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)}*/ - ret =usb_submit_urb (pFt1000Dev->tx_urb,GFP_ATOMIC ); -if (ret) - { + ret =usb_submit_urb (pFt1000Dev->tx_urb,GFP_ATOMIC ); +if (ret) {DEBUG ("ft1000 failed tx_urb %d\n" , ret); - -return STATUS_FAILURE ; - - } -else - { -//DEBUG("ft1000 sucess tx_urb %d\n", ret); - - pInfo->stats.tx_packets++; - pInfo->stats.tx_bytes += (len+14 ); - } +return ret; + }else { + pInfo->stats.tx_packets++; + pInfo->stats.tx_bytes += (len+14 ); + }//DEBUG("ft1000_copy_down_pkt() exit\n"); -return STATUS_SUCCESS ; +return 0 ; }//---------------------------------------------------------------------------
Signature · 1 line
1.7.1
PATCH 2/4 staging: ft1000: Use common return point.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +9 -14
@@ -1121,14 +1121,13 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)if ( skb ==NULL ) {DEBUG ("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n" ); -return STATUS_FAILURE ; +return NETDEV_TX_OK ; }if ( pFt1000Dev->status &FT1000_STATUS_CLOSING ) {DEBUG ("network driver is closed, return\n" ); -dev_kfree_skb (skb); -return STATUS_SUCCESS ; + goto err; }//DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len);
@@ -1147,28 +1146,24 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) {/* Drop packet is mediastate is down */ DEBUG ("ft1000_hw:ft1000_start_xmit:mediastate is down\n" ); -dev_kfree_skb (skb); -return STATUS_SUCCESS ; + goto err; }if ( (skb->len <ENET_HEADER_SIZE ) || (skb->len >ENET_MAX_SIZE ) ) {/* Drop packet which has invalid size */ DEBUG ("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n" ); -dev_kfree_skb (skb); -return STATUS_SUCCESS ; + goto err; }//mbelian -if (ft1000_copy_down_pkt (dev, (pdata+ENET_HEADER_SIZE -2 ), skb->len -ENET_HEADER_SIZE +2 ) ==STATUS_FAILURE ) - { -dev_kfree_skb (skb); -return STATUS_SUCCESS ; - } +ft1000_copy_down_pkt (dev, (pdata+ENET_HEADER_SIZE -2 ), + skb->len -ENET_HEADER_SIZE +2 ); -dev_kfree_skb (skb); +err: +dev_kfree_skb (skb);//DEBUG(" ft1000_start_xmit() exit\n"); -return 0 ; +return NETDEV_TX_OK ; }//---------------------------------------------------------------------------
Signature · 1 line
1.7.1
PATCH 3/4 staging: ft1000: Correct return error values.
In reply to Marek BeliskoSigned-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +3 -3
@@ -1306,7 +1306,7 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info) {DEBUG ("network driver is closed, return\n" );//usb_kill_urb(pFt1000Dev->rx_urb); //mbelian -return STATUS_SUCCESS ; +return -ENODEV ; } usb_fill_bulk_urb(pFt1000Dev->rx_urb,
@@ -1321,12 +1321,12 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)if ((result =usb_submit_urb (pFt1000Dev->rx_urb,GFP_ATOMIC ))) {printk ("ft1000_submit_rx_urb: submitting rx_urb %d failed\n" , result); -return STATUS_FAILURE ; +return result; }//DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result); -return STATUS_SUCCESS ; +return 0 ; }//---------------------------------------------------------------------------
Signature · 1 line
1.7.1
PATCH 4/4 staging: ft1000: Check return value.
In reply to Marek BeliskoFunction ft1000_submit_rx_urb() could fail so add checking for return value.
Signed-off-by Marek Belisko <[email protected]>
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +4 -2
@@ -1347,6 +1347,7 @@ static int ft1000_open (struct net_device *dev) {struct ft1000_info *pInfo = (struct ft1000_info *)netdev_priv (dev);struct timeval tv;//mbelian +int ret;DEBUG ("ft1000_open is called for card %d\n" , pInfo->CardNumber);//DEBUG("ft1000_open: dev->addr=%x, dev->addr_len=%d\n", dev->addr, dev->addr_len);
@@ -1364,8 +1365,9 @@ static int ft1000_open (struct net_device *dev)netif_carrier_on (dev);//mbelian -ft1000_submit_rx_urb (pInfo); -return 0 ; + ret =ft1000_submit_rx_urb (pInfo); + +return ret; }//---------------------------------------------------------------------------
Signature · 1 line
1.7.1