2020-01-08 17:27:41

by Dejin Zheng

[permalink] [raw]
Subject: [PATCH v3] net: stmmac: pci: remove the duplicate code of set phy_mask

All members of mdio_bus_data are cleared to 0 when it was obtained
by devm_kzalloc(). so It doesn't need to set phy_mask as 0 again.

Signed-off-by: Dejin Zheng <[email protected]>
---

Changes since v2:
Abandoned the other commits, now only this one commit is
in the patch set.

Changes since v1:
adjust some commit comments.

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 8237dbc3e991..40f171d310d7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -65,7 +65,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
plat->force_sf_dma_mode = 1;

plat->mdio_bus_data->needs_reset = true;
- plat->mdio_bus_data->phy_mask = 0;

/* Set default value for multicast hash bins */
plat->multicast_filter_bins = HASH_TABLE_SIZE;
@@ -154,8 +153,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
plat->tx_queues_cfg[6].weight = 0x0F;
plat->tx_queues_cfg[7].weight = 0x10;

- plat->mdio_bus_data->phy_mask = 0;
-
plat->dma_cfg->pbl = 32;
plat->dma_cfg->pblx8 = true;
plat->dma_cfg->fixed_burst = 0;
@@ -386,8 +383,6 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,
plat->tso_en = 1;
plat->pmt = 1;

- plat->mdio_bus_data->phy_mask = 0;
-
/* Set default value for multicast hash bins */
plat->multicast_filter_bins = HASH_TABLE_SIZE;

--
2.17.1


2020-01-10 02:36:10

by David Miller

[permalink] [raw]
Subject: Re: [PATCH v3] net: stmmac: pci: remove the duplicate code of set phy_mask

From: Dejin Zheng <[email protected]>
Date: Wed, 8 Jan 2020 21:56:49 +0800

> All members of mdio_bus_data are cleared to 0 when it was obtained
> by devm_kzalloc(). so It doesn't need to set phy_mask as 0 again.
>
> Signed-off-by: Dejin Zheng <[email protected]>
> ---
>
> Changes since v2:
> Abandoned the other commits, now only this one commit is
> in the patch set.
>
> Changes since v1:
> adjust some commit comments.

Applied to net-next, thanks.