diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-10 16:55:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-10 16:55:14 -0500 |
commit | fb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch) | |
tree | ee3d535ab38d680b424a857406789f8c28bf5266 /drivers/net/phy/phy_device.c | |
parent | 23779897546c1effb546ff89b89803d9d955d517 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r-- | drivers/net/phy/phy_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e11b03b2b25a..e976c1c60095 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
@@ -74,7 +74,7 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, | |||
74 | if (!fixup) | 74 | if (!fixup) |
75 | return -ENOMEM; | 75 | return -ENOMEM; |
76 | 76 | ||
77 | strncpy(fixup->bus_id, bus_id, BUS_ID_SIZE); | 77 | strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id)); |
78 | fixup->phy_uid = phy_uid; | 78 | fixup->phy_uid = phy_uid; |
79 | fixup->phy_uid_mask = phy_uid_mask; | 79 | fixup->phy_uid_mask = phy_uid_mask; |
80 | fixup->run = run; | 80 | fixup->run = run; |
@@ -109,7 +109,7 @@ EXPORT_SYMBOL(phy_register_fixup_for_id); | |||
109 | */ | 109 | */ |
110 | static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup) | 110 | static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup) |
111 | { | 111 | { |
112 | if (strcmp(fixup->bus_id, phydev->dev.bus_id) != 0) | 112 | if (strcmp(fixup->bus_id, dev_name(&phydev->dev)) != 0) |
113 | if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0) | 113 | if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0) |
114 | return 0; | 114 | return 0; |
115 | 115 | ||