lkml.org 
[lkml]   [2011]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 088/117] Staging: hv: netvsc: Inline the code for free_net_device()
    Date
    Inline the code for free_net_device().

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    ---
    drivers/staging/hv/netvsc.c | 12 ++----------
    1 files changed, 2 insertions(+), 10 deletions(-)

    diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
    index b6e1fb9..75c6ed7 100644
    --- a/drivers/staging/hv/netvsc.c
    +++ b/drivers/staging/hv/netvsc.c
    @@ -49,14 +49,6 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
    return net_device;
    }

    -static void free_net_device(struct netvsc_device *device)
    -{
    - WARN_ON(atomic_read(&device->refcnt) != 0);
    - device->dev->ext = NULL;
    - kfree(device);
    -}
    -
    -
    /* Get the net device object iff exists and its refcount > 1 */
    static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
    {
    @@ -438,7 +430,7 @@ int netvsc_device_remove(struct hv_device *device)
    kfree(netvsc_packet);
    }

    - free_net_device(net_device);
    + kfree(net_device);
    return 0;
    }

    @@ -980,7 +972,7 @@ cleanup:
    release_outbound_net_device(device);
    release_inbound_net_device(device);

    - free_net_device(net_device);
    + kfree(net_device);
    }

    return ret;
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-07-15 19:41    [W:0.020 / U:89.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site