diff options
| author |   Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 19:37:54 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-31 13:44:48 -0500 |
| commit | 34a5102c3235c470a6c77fba16cb971964d9c136 (patch) | |
| tree | 40eaf79e6b76d53a889ad8c6168c85e0f79acce1 /drivers/net/ethernet/broadcom/bgmac-platform.c | |
| parent | net: dsa: bcm_sf2: Fix build module (diff) | |
| download | linux-dev-34a5102c3235c470a6c77fba16cb971964d9c136.tar.xz linux-dev-34a5102c3235c470a6c77fba16cb971964d9c136.zip | |
net: bgmac: allocate struct bgmac just once & don't copy it
So far were were allocating struct bgmac in 3 places: platform code,
bcma code and shared bgmac_enet_probe function. The reason for this was
bgmac_enet_probe:
1) Requiring early-filled struct bgmac
2) Calling alloc_etherdev on its own in order to use netdev_priv later
This solution got few drawbacks:
1) Was duplicating allocating code
2) Required copying early-filled struct
3) Resulted in platform/bcma code having access only to unused struct
Solve this situation by simply extracting some probe code into the new
bgmac_alloc function.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bgmac-platform.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac-platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c index 6f736c19872f..805e6ed6c390 100644 --- a/drivers/net/ethernet/broadcom/bgmac-platform.c +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c @@ -151,7 +151,7 @@ static int bgmac_probe(struct platform_device *pdev) struct resource *regs; const u8 *mac_addr; - bgmac = devm_kzalloc(&pdev->dev, sizeof(*bgmac), GFP_KERNEL); + bgmac = bgmac_alloc(&pdev->dev); if (!bgmac) return -ENOMEM; |