| From 049519721ae82d5c0ac4e4ea7a77190ade532cff Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Tue, 13 May 2014 02:30:14 +0400 |
| Subject: sh_eth: replace devm_kzalloc() with devm_kmalloc_array() |
| |
| When I was converting the driver to the managed device API, only devm_kzalloc() |
| was available for memory allocation, so I had to use it, despite zeroing out the |
| PHY IRQ array right before initializing all its entries to PHY_POLL was quite |
| stupid. Now that devm_kmalloc_array() has become available, we can avoid the |
| needless zeroing out... |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 86b5d251d5ac4dda51a022b34cb29b4ce65a8cd5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 08ed9a30c3a7..2a29caa30479 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -2641,8 +2641,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp, |
| pdev->name, pdev->id); |
| |
| /* PHY IRQ */ |
| - mdp->mii_bus->irq = devm_kzalloc(dev, sizeof(int) * PHY_MAX_ADDR, |
| - GFP_KERNEL); |
| + mdp->mii_bus->irq = devm_kmalloc_array(dev, PHY_MAX_ADDR, sizeof(int), |
| + GFP_KERNEL); |
| if (!mdp->mii_bus->irq) { |
| ret = -ENOMEM; |
| goto out_free_bus; |
| -- |
| 2.1.2 |
| |
