Commit 6f4a7f41 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Jeff Garzik
Browse files

PHY: Add the phy_device_release device method. 



Lately I've got this nice badness on mdio bus removal:

Device 'e0103120:06' does not have a release() function, it is broken and must be fixed.
------------[ cut here ]------------
Badness at drivers/base/core.c:107
NIP: c015c1a8 LR: c015c1a8 CTR: c0157488
REGS: c34bdcf0 TRAP: 0700   Not tainted  (2.6.23-rc5-g9ebadfbb-dirty)
MSR: 00029032 <EE,ME,IR,DR>  CR: 24088422  XER: 00000000
...
[c34bdda0] [c015c1a8] device_release+0x78/0x80 (unreliable)
[c34bddb0] [c01354cc] kobject_cleanup+0x80/0xbc
[c34bddd0] [c01365f0] kref_put+0x54/0x6c
[c34bdde0] [c013543c] kobject_put+0x24/0x34
[c34bddf0] [c015c384] put_device+0x1c/0x2c
[c34bde00] [c0180e84] mdiobus_unregister+0x2c/0x58
...

Though actually there is nothing broken, it just device
subsystem core expects another "pattern" of resource managment.

This patch implement phy device's release function, thus
we're getting rid of this badness.

Also small hidden bug fixed, hope none other introduced. ;-)

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f9663aea

drivers/net/phy/mdio_bus.c

+5 −4
Original line number Diff line number Diff line
@@ -91,9 +91,12 @@ int mdiobus_register(struct mii_bus *bus) 


			err = device_register(&phydev->dev);



			if (err)

			if (err) {

				printk(KERN_ERR "phy %d failed to register\n",

						i);

				phy_device_free(phydev);

				phydev = NULL;

			}

		}



		bus->phy_map[i] = phydev;
@@ -110,10 +113,8 @@ void mdiobus_unregister(struct mii_bus *bus) 
	int i;



	for (i = 0; i < PHY_MAX_ADDR; i++) {

		if (bus->phy_map[i]) {

		if (bus->phy_map[i])

			device_unregister(&bus->phy_map[i]->dev);

			kfree(bus->phy_map[i]);

		}

	}

}

EXPORT_SYMBOL(mdiobus_unregister);

drivers/net/phy/phy_device.c

+12 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ static struct phy_driver genphy_driver; 
extern int mdio_bus_init(void);

extern void mdio_bus_exit(void);



void phy_device_free(struct phy_device *phydev)

{

	kfree(phydev);

}



static void phy_device_release(struct device *dev)

{

	phy_device_free(to_phy_device(dev));

}



struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)

{

	struct phy_device *dev;
@@ -54,6 +64,8 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) 
	if (NULL == dev)

		return (struct phy_device*) PTR_ERR((void*)-ENOMEM);



	dev->dev.release = phy_device_release;



	dev->speed = 0;

	dev->duplex = -1;

	dev->pause = dev->asym_pause = 0;

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ int phy_mii_ioctl(struct phy_device *phydev, 
int phy_start_interrupts(struct phy_device *phydev);

void phy_print_status(struct phy_device *phydev);

struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);

void phy_device_free(struct phy_device *phydev);



extern struct bus_type mdio_bus_type;

#endif /* __PHY_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE