Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c489be08 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: use kcalloc instead of kzalloc 



There were two places that used kzalloc() with a multiplied sizeof(),
replace these with kcalloc as recommended by checkpatch.pl.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8900ea57

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+3 −3
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv, 
	priv->rx_bd_assign_index = 0;

	priv->rx_c_index = 0;

	priv->rx_read_ptr = 0;

	priv->rx_cbs = kzalloc(priv->num_rx_bds * sizeof(struct enet_cb),

	priv->rx_cbs = kcalloc(priv->num_rx_bds, sizeof(struct enet_cb),

			       GFP_KERNEL);

	if (!priv->rx_cbs)

		return -ENOMEM;
@@ -1773,7 +1773,7 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv) 
	/* Initialize commont TX ring structures */

	priv->tx_bds = priv->base + priv->hw_params->tdma_offset;

	priv->num_tx_bds = TOTAL_DESC;

	priv->tx_cbs = kzalloc(priv->num_tx_bds * sizeof(struct enet_cb),

	priv->tx_cbs = kcalloc(priv->num_tx_bds, sizeof(struct enet_cb),

			       GFP_KERNEL);

	if (!priv->tx_cbs) {

		bcmgenet_fini_dma(priv);

drivers/net/ethernet/broadcom/genet/bcmmii.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int bcmgenet_mii_alloc(struct bcmgenet_priv *priv) 
	snprintf(bus->id, MII_BUS_ID_SIZE, "%s-%d",

		 priv->pdev->name, priv->pdev->id);



	bus->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);

	bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);

	if (!bus->irq) {

		mdiobus_free(priv->mii_bus);

		return -ENOMEM;