[v2,02/10] net: ethernet: ixgbe: don't call devm_mdiobus_free()

Commit Message

Bartosz Golaszewski June 29, 2020, 12:03 p.m. UTC

From: Bartosz Golaszewski <[e-mail]>

The idea behind devres is that the release callbacks are called if
probe fails. As we now check the return value of ixgbe_mii_bus_init(),
we can drop the call devm_mdiobus_free() in error path as the release
callback will be called automatically.

Signed-off-by: Bartosz Golaszewski <[e-mail]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

Comments

Florian Fainelli June 29, 2020, 4:58 p.m. UTC | #1

On 6/29/2020 5:03 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[e-mail]>
> 
> The idea behind devres is that the release callbacks are called if
> probe fails. As we now check the return value of ixgbe_mii_bus_init(),
> we can drop the call devm_mdiobus_free() in error path as the release
> callback will be called automatically.
> 
> Signed-off-by: Bartosz Golaszewski <[e-mail]>

Reviewed-by: Florian Fainelli <[e-mail]>

Kirsher, Jeffrey T June 29, 2020, 5:18 p.m. UTC | #2

> -----Original Message-----
> From: Bartosz Golaszewski <[e-mail]>
> Sent: Monday, June 29, 2020 05:04
> To: Kirsher, Jeffrey T <[e-mail]>; David S . Miller
> <[e-mail]>; Jakub Kicinski <[e-mail]>; John Crispin
> <[e-mail]>; Sean Wang <[e-mail]>; Mark Lee
> <[e-mail]>; Matthias Brugger
> <[e-mail]>; Heiner Kallweit <[e-mail]>; Andrew
> Lunn <[e-mail]>; Florian Fainelli <[e-mail]>; Russell King
> <[e-mail]>; Rob Herring <[e-mail]>; Frank Rowand
> <[e-mail]>
> Cc: [e-mail]; [e-mail]; linux-arm-
> [e-mail]; [e-mail];
> [e-mail]; Bartosz Golaszewski
> <[e-mail]>
> Subject: [PATCH v2 02/10] net: ethernet: ixgbe: don't call
> devm_mdiobus_free()
> 
> From: Bartosz Golaszewski <[e-mail]>
> 
> The idea behind devres is that the release callbacks are called if probe fails. As
> we now check the return value of ixgbe_mii_bus_init(), we can drop the call
> devm_mdiobus_free() in error path as the release callback will be called
> automatically.
> 
> Signed-off-by: Bartosz Golaszewski <[e-mail]>
 
Acked-by: Jeff Kirsher <[e-mail]>

> ---
>  drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 2fb97967961c..7980d7265e10 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -905,7 +905,6 @@  s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
 	struct pci_dev *pdev = adapter->pdev;
 	struct device *dev = &adapter->netdev->dev;
 	struct mii_bus *bus;
-	int err = -ENODEV;
 
 	bus = devm_mdiobus_alloc(dev);
 	if (!bus)
@@ -923,7 +922,7 @@  s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
 	case IXGBE_DEV_ID_X550EM_A_1G_T:
 	case IXGBE_DEV_ID_X550EM_A_1G_T_L:
 		if (!ixgbe_x550em_a_has_mii(hw))
-			goto ixgbe_no_mii_bus;
+			return -ENODEV;
 		bus->read = &ixgbe_x550em_a_mii_bus_read;
 		bus->write = &ixgbe_x550em_a_mii_bus_write;
 		break;
@@ -948,15 +947,8 @@  s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
 	 */
 	hw->phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22;
 
-	err = mdiobus_register(bus);
-	if (!err) {
-		adapter->mii_bus = bus;
-		return 0;
-	}
-
-ixgbe_no_mii_bus:
-	devm_mdiobus_free(dev, bus);
-	return err;
+	adapter->mii_bus = bus;
+	return mdiobus_register(bus);
 }
 
 /**