Commit 6f4a7f4183bdbd02741dcd8edbd10b8628acc5d5
Committed by
Jeff Garzik
Jeff Garzik
1 parent
f9663aea2a
Exists in
master
and in
7 other branches
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: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Showing 3 changed files with 18 additions and 4 deletions Side-by-side Diff
drivers/net/phy/mdio_bus.c
| ... | ... | @@ -91,9 +91,12 @@ |
| 91 | 91 | |
| 92 | 92 | err = device_register(&phydev->dev); |
| 93 | 93 | |
| 94 | - if (err) | |
| 94 | + if (err) { | |
| 95 | 95 | printk(KERN_ERR "phy %d failed to register\n", |
| 96 | 96 | i); |
| 97 | + phy_device_free(phydev); | |
| 98 | + phydev = NULL; | |
| 99 | + } | |
| 97 | 100 | } |
| 98 | 101 | |
| 99 | 102 | bus->phy_map[i] = phydev; |
| 100 | 103 | |
| ... | ... | @@ -110,10 +113,8 @@ |
| 110 | 113 | int i; |
| 111 | 114 | |
| 112 | 115 | for (i = 0; i < PHY_MAX_ADDR; i++) { |
| 113 | - if (bus->phy_map[i]) { | |
| 116 | + if (bus->phy_map[i]) | |
| 114 | 117 | device_unregister(&bus->phy_map[i]->dev); |
| 115 | - kfree(bus->phy_map[i]); | |
| 116 | - } | |
| 117 | 118 | } |
| 118 | 119 | } |
| 119 | 120 | EXPORT_SYMBOL(mdiobus_unregister); |
drivers/net/phy/phy_device.c
| ... | ... | @@ -44,6 +44,16 @@ |
| 44 | 44 | extern int mdio_bus_init(void); |
| 45 | 45 | extern void mdio_bus_exit(void); |
| 46 | 46 | |
| 47 | +void phy_device_free(struct phy_device *phydev) | |
| 48 | +{ | |
| 49 | + kfree(phydev); | |
| 50 | +} | |
| 51 | + | |
| 52 | +static void phy_device_release(struct device *dev) | |
| 53 | +{ | |
| 54 | + phy_device_free(to_phy_device(dev)); | |
| 55 | +} | |
| 56 | + | |
| 47 | 57 | struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) |
| 48 | 58 | { |
| 49 | 59 | struct phy_device *dev; |
| ... | ... | @@ -53,6 +63,8 @@ |
| 53 | 63 | |
| 54 | 64 | if (NULL == dev) |
| 55 | 65 | return (struct phy_device*) PTR_ERR((void*)-ENOMEM); |
| 66 | + | |
| 67 | + dev->dev.release = phy_device_release; | |
| 56 | 68 | |
| 57 | 69 | dev->speed = 0; |
| 58 | 70 | dev->duplex = -1; |
include/linux/phy.h
| ... | ... | @@ -403,6 +403,7 @@ |
| 403 | 403 | int phy_start_interrupts(struct phy_device *phydev); |
| 404 | 404 | void phy_print_status(struct phy_device *phydev); |
| 405 | 405 | struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id); |
| 406 | +void phy_device_free(struct phy_device *phydev); | |
| 406 | 407 | |
| 407 | 408 | extern struct bus_type mdio_bus_type; |
| 408 | 409 | #endif /* __PHY_H */ |