diff mbox series

[net] net: fec: Fix unbalanced PM runtime calls

Message ID 20180318194952.31411-1-f.fainelli@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] net: fec: Fix unbalanced PM runtime calls | expand

Commit Message

Florian Fainelli March 18, 2018, 7:49 p.m. UTC
When unbinding/removing the driver, we will run into the following warnings:

[  259.655198] fec 400d1000.ethernet: 400d1000.ethernet supply phy not found, using dummy regulator
[  259.665065] fec 400d1000.ethernet: Unbalanced pm_runtime_enable!
[  259.672770] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Invalid MAC address: 00:00:00:00:00:00
[  259.683062] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Using random MAC address: f2:3e:93:b7:29:c1
[  259.696239] libphy: fec_enet_mii_bus: probed

Avoid these warnings by balancing the runtime PM calls during fec_drv_remove().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Miller March 18, 2018, 8:35 p.m. UTC | #1
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sun, 18 Mar 2018 12:49:51 -0700

> When unbinding/removing the driver, we will run into the following warnings:
> 
> [  259.655198] fec 400d1000.ethernet: 400d1000.ethernet supply phy not found, using dummy regulator
> [  259.665065] fec 400d1000.ethernet: Unbalanced pm_runtime_enable!
> [  259.672770] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Invalid MAC address: 00:00:00:00:00:00
> [  259.683062] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Using random MAC address: f2:3e:93:b7:29:c1
> [  259.696239] libphy: fec_enet_mii_bus: probed
> 
> Avoid these warnings by balancing the runtime PM calls during fec_drv_remove().
> 
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thank you.

Queue this up for -stable?
Florian Fainelli March 18, 2018, 9:42 p.m. UTC | #2
On 03/18/2018 01:35 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Sun, 18 Mar 2018 12:49:51 -0700
> 
>> When unbinding/removing the driver, we will run into the following warnings:
>>
>> [  259.655198] fec 400d1000.ethernet: 400d1000.ethernet supply phy not found, using dummy regulator
>> [  259.665065] fec 400d1000.ethernet: Unbalanced pm_runtime_enable!
>> [  259.672770] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Invalid MAC address: 00:00:00:00:00:00
>> [  259.683062] fec 400d1000.ethernet (unnamed net_device) (uninitialized): Using random MAC address: f2:3e:93:b7:29:c1
>> [  259.696239] libphy: fec_enet_mii_bus: probed
>>
>> Avoid these warnings by balancing the runtime PM calls during fec_drv_remove().
>>
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> 
> Applied, thank you.
> 
> Queue this up for -stable?

I would be inclined to say yes, it was not exactly easy to track down a
set of commits, since this was changed quite a bit.
David Miller March 19, 2018, 12:12 a.m. UTC | #3
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sun, 18 Mar 2018 14:42:22 -0700

> On 03/18/2018 01:35 PM, David Miller wrote:
>> Queue this up for -stable?
> 
> I would be inclined to say yes, it was not exactly easy to track down a
> set of commits, since this was changed quite a bit.

Ok, queued up.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 7a7f3a42b2aa..d4604bc8eb5b 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3600,6 +3600,8 @@  fec_drv_remove(struct platform_device *pdev)
 	fec_enet_mii_remove(fep);
 	if (fep->reg_phy)
 		regulator_disable(fep->reg_phy);
+	pm_runtime_put(&pdev->dev);
+	pm_runtime_disable(&pdev->dev);
 	if (of_phy_is_fixed_link(np))
 		of_phy_deregister_fixed_link(np);
 	of_node_put(fep->phy_node);