From cfb3bb7fdde7a9367b556adec8e9ede550dcae65 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Mon, 13 Dec 2010 10:39:20 +0100 Subject: [PATCH] --- yaml --- r: 228367 b: refs/heads/master c: 448d40140196b33f63a0a3f3f8bcad8f14c9c432 h: refs/heads/master i: 228365: 598805b349997b808898cd795d28dff509395bb3 228363: c07ac29cf88acff2a8a8420d55b31a5a14dd8f99 228359: a05ca360cf04d7a01eb2a5cde61c90bde48e1bff 228351: 89afbffab92f4e63674e117fecc1c12bba3127fd v: v3 --- [refs] | 2 +- .../drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 87eb2b4c88c4..05b67506c7fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 983bbfd091be5b3e1a729f31cce29431fbff2d27 +refs/heads/master: 448d40140196b33f63a0a3f3f8bcad8f14c9c432 diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index 7456787481c8..643a63794ade 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c @@ -41,7 +41,6 @@ static int ft1000_chkcard (struct ft1000_device *dev); //Jim static u8 tempbuffer[1600]; -static unsigned long gCardIndex; #define MAX_RCV_LOOP 100 @@ -773,8 +772,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) int i, ret_val; struct list_head *cur, *tmp; char card_nr[2]; - - gCardIndex=0; //mbelian + unsigned long gCardIndex = 0; DEBUG("Enter init_ft1000_netdev...\n"); @@ -794,9 +792,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) dev_alloc_name(netdev, netdev->name); - //for the first inserted card, decide the card index beginning number, in case there are existing network interfaces - if ( gCardIndex == 0 ) - { DEBUG("init_ft1000_netdev: network device name is %s\n", netdev->name); if ( strncmp(netdev->name,"eth", 3) == 0) { @@ -816,13 +811,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) ret_val = -ENXIO; goto err_net; } - } - else - { - //not the first inserted card, increase card number by 1 - pInfo->CardNumber = gCardIndex; - /*DEBUG("card number = %d\n", pInfo->CardNumber);*/ //mbelian - } memset(&pInfo->stats, 0, sizeof(struct net_device_stats) );