Signed-off-by: Jack Stone CC: David Millver --- drivers/net/gianfar.c | 6 ++---- drivers/net/lance.c | 3 +-- drivers/net/s2io.c | 4 ++-- drivers/net/sgiseeq.c | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) Index: b/drivers/net/lance.c =================================================================== --- a/drivers/net/lance.c +++ b/drivers/net/lance.c @@ -539,8 +539,7 @@ static int __init lance_probe1(struct ne if (lance_debug > 6) printk(" (#0x%05lx)", (unsigned long)lp); dev->priv = lp; lp->name = chipname; - lp->rx_buffs = (unsigned long)kmalloc(PKT_BUF_SZ*RX_RING_SIZE, - GFP_DMA | GFP_KERNEL); + lp->rx_buffs = kmalloc(PKT_BUF_SZ*RX_RING_SIZE, GFP_DMA | GFP_KERNEL); if (!lp->rx_buffs) goto out_lp; if (lance_need_isa_bounce_buffers) { Index: b/drivers/net/gianfar.c =================================================================== --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -737,8 +737,7 @@ int startup_gfar(struct net_device *dev) gfar_write(®s->rbase0, addr); /* Setup the skbuff rings */ - priv->tx_skbuff = - (struct sk_buff **) kmalloc(sizeof (struct sk_buff *) * + priv->tx_skbuff = kmalloc(sizeof (struct sk_buff *) * priv->tx_ring_size, GFP_KERNEL); if (NULL == priv->tx_skbuff) { @@ -752,8 +751,7 @@ int startup_gfar(struct net_device *dev) for (i = 0; i < priv->tx_ring_size; i++) priv->tx_skbuff[i] = NULL; - priv->rx_skbuff = - (struct sk_buff **) kmalloc(sizeof (struct sk_buff *) * + priv->rx_skbuff = kmalloc(sizeof (struct sk_buff *) * priv->rx_ring_size, GFP_KERNEL); if (NULL == priv->rx_skbuff) { Index: b/drivers/net/s2io.c =================================================================== --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -729,7 +729,7 @@ static int init_shared_mem(struct s2io_n while (k != rxd_count[nic->rxd_mode]) { ba = &mac_control->rings[i].ba[j][k]; - ba->ba_0_org = (void *) kmalloc + ba->ba_0_org = kmalloc (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); if (!ba->ba_0_org) return -ENOMEM; @@ -740,7 +740,7 @@ static int init_shared_mem(struct s2io_n tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_0 = (void *) tmp; - ba->ba_1_org = (void *) kmalloc + ba->ba_1_org = kmalloc (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); if (!ba->ba_1_org) return -ENOMEM; Index: b/drivers/net/sgiseeq.c =================================================================== --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c @@ -167,7 +167,7 @@ static int seeq_init_ring(struct net_dev if (!sp->tx_desc[i].tdma.pbuf) { unsigned long buffer; - buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL); + buffer = kmalloc(PKT_BUF_SZ, GFP_KERNEL); if (!buffer) return -ENOMEM; sp->tx_desc[i].buf_vaddr = CKSEG1ADDR(buffer); @@ -181,7 +181,7 @@ static int seeq_init_ring(struct net_dev if (!sp->rx_desc[i].rdma.pbuf) { unsigned long buffer; - buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL); + buffer = kmalloc(PKT_BUF_SZ, GFP_KERNEL); if (!buffer) return -ENOMEM; sp->rx_desc[i].buf_vaddr = CKSEG1ADDR(buffer); -- - 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/