lkml.org 
[lkml]   [2007]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subjectdrivers/net/tokenring/3c359.c
    From
    Date
    Hi,
    Replacing kmalloc with kzalloc and cleaning up memset in
    drivers/net/tokenring/3c359.c


    Signed-off-by: Surya Prabhakar <surya.prabhakar@wipro.com>
    ---

    diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
    index 9f1b6ab..d36dd53 100644
    --- a/drivers/net/tokenring/3c359.c
    +++ b/drivers/net/tokenring/3c359.c
    @@ -641,14 +641,14 @@ static int xl_open(struct net_device *dev)
    * Now to set up the Rx and Tx buffer structures
    */
    /* These MUST be on 8 byte boundaries */
    - xl_priv->xl_tx_ring = kmalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL) ;
    + xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL) ;
    if (xl_priv->xl_tx_ring == NULL) {
    printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
    dev->name);
    free_irq(dev->irq,dev);
    return -ENOMEM;
    }
    - xl_priv->xl_rx_ring = kmalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL) ;
    + xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL) ;
    if (xl_priv->xl_tx_ring == NULL) {
    printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
    dev->name);
    @@ -656,8 +656,6 @@ static int xl_open(struct net_device *dev)
    kfree(xl_priv->xl_tx_ring);
    return -ENOMEM;
    }
    - memset(xl_priv->xl_tx_ring,0,sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) ;
    - memset(xl_priv->xl_rx_ring,0,sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) ;

    /* Setup Rx Ring */
    for (i=0 ; i < XL_RX_RING_SIZE ; i++) {
    --
    thanks
    surya.
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-13 15:47    [W:0.021 / U:0.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site