stmmac: pci: allocate memory resources dynamically
Subsystems (4)
PATCH 1/1 stmmac: pci: allocate memory resources dynamically
Instead of using global variables we are going to use dynamically allocated memory. It allows to append a support of more than one ethernet adapter which might have different settings simultaniously.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 55 +++++++++++++----------- 1 file changed, 31 insertions(+), 24 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +31 -24
@@ -26,34 +26,26 @@#include <linux/pci.h> #include "stmmac.h" -static struct plat_stmmacenet_data plat_dat; -static struct stmmac_mdio_bus_data mdio_data; -static struct stmmac_dma_cfg dma_cfg; - -static void stmmac_default_data (void ) +static void stmmac_default_data (struct plat_stmmacenet_data *plat) { -memset (&plat_dat,0 ,sizeof (struct plat_stmmacenet_data )); - - plat_dat.bus_id =1 ; - plat_dat.phy_addr =0 ; - plat_dat.interface =PHY_INTERFACE_MODE_GMII ; - plat_dat.clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ - plat_dat.has_gmac =1 ; - plat_dat.force_sf_dma_mode =1 ; + plat->bus_id =1 ; + plat->phy_addr =0 ; + plat->interface =PHY_INTERFACE_MODE_GMII ; + plat->clk_csr =2 ;/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ + plat->has_gmac =1 ; + plat->force_sf_dma_mode =1 ; - mdio_data.phy_reset =NULL ; - mdio_data.phy_mask =0 ; - plat_dat.mdio_bus_data = &mdio_data; + plat->mdio_bus_data->phy_reset =NULL ; + plat->mdio_bus_data->phy_mask =0 ; - dma_cfg.pbl =32 ; - dma_cfg.burst_len =DMA_AXI_BLEN_256 ; - plat_dat.dma_cfg = &dma_cfg; + plat->dma_cfg->pbl =32 ; + plat->dma_cfg->burst_len =DMA_AXI_BLEN_256 ;/* Set default value for multicast hash bins */ - plat_dat.multicast_filter_bins =HASH_TABLE_SIZE ; + plat->multicast_filter_bins =HASH_TABLE_SIZE ;/* Set default value for unicast filter entries */ - plat_dat.unicast_filter_entries =1 ; + plat->unicast_filter_entries =1 ; }/**
@@ -71,10 +63,26 @@ static void stmmac_default_data(void)static int stmmac_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) { +struct plat_stmmacenet_data *plat;struct stmmac_priv *priv;int i;int ret; + plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL ); +if (!plat) +return -ENOMEM ; + + plat->mdio_bus_data =devm_kzalloc (&pdev->dev, +sizeof (*plat->mdio_bus_data), +GFP_KERNEL ); +if (!plat->mdio_bus_data) +return -ENOMEM ; + + plat->dma_cfg =devm_kzalloc (&pdev->dev,sizeof (*plat->dma_cfg), +GFP_KERNEL ); +if (!plat->dma_cfg) +return -ENOMEM ; +/* Enable pci device */ ret =pcim_enable_device (pdev);if (ret) {
@@ -95,10 +103,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev,pci_set_master (pdev); -stmmac_default_data (); +stmmac_default_data (plat); - priv =stmmac_dvr_probe (&pdev->dev, &plat_dat, -pcim_iomap_table (pdev)[i]); + priv =stmmac_dvr_probe (&pdev->dev, plat,pcim_iomap_table (pdev)[i]);if (IS_ERR (priv)) {dev_err (&pdev->dev,"%s: main driver probe failed\n" , __func__);return PTR_ERR (priv);
Signature · 1 line
2.1.3
From: Andy Shevchenko <[email protected]>
Date: Fri, 28 Nov 2014 15:40:56 +0200
Quoted 5 lines
Instead of using global variables we are going to use dynamically allocated memory. It allows to append a support of more than one ethernet adapter which might have different settings simultaniously.
Signed-off-by Andy Shevchenko <[email protected]>
Applied, thanks.