diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:55:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-29 19:25:51 -0400 |
commit | 4192c74940e23da727eb02b7b4ee779dde2f670a (patch) | |
tree | b4054a9a11b9d444f75cff23a067ab4f09ef129e | |
parent | 3eae13671716492f3bcde270115407185e9c69fd (diff) |
mdio_bus: convert bus code to use dev_groups
The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead. This converts the MDIO bus code to use the
correct field.
Cc: David S. Miller <davem@davemloft.net>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Nick Bowler <nbowler@elliptictech.com>
Cc: <netdev@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/net/phy/mdio_bus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index dc920974204e..56178761ce93 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c | |||
@@ -438,17 +438,19 @@ phy_id_show(struct device *dev, struct device_attribute *attr, char *buf) | |||
438 | 438 | ||
439 | return sprintf(buf, "0x%.8lx\n", (unsigned long)phydev->phy_id); | 439 | return sprintf(buf, "0x%.8lx\n", (unsigned long)phydev->phy_id); |
440 | } | 440 | } |
441 | static DEVICE_ATTR_RO(phy_id); | ||
441 | 442 | ||
442 | static struct device_attribute mdio_dev_attrs[] = { | 443 | static struct attribute *mdio_dev_attrs[] = { |
443 | __ATTR_RO(phy_id), | 444 | &dev_attr_phy_id.attr, |
444 | __ATTR_NULL | 445 | NULL, |
445 | }; | 446 | }; |
447 | ATTRIBUTE_GROUPS(mdio_dev); | ||
446 | 448 | ||
447 | struct bus_type mdio_bus_type = { | 449 | struct bus_type mdio_bus_type = { |
448 | .name = "mdio_bus", | 450 | .name = "mdio_bus", |
449 | .match = mdio_bus_match, | 451 | .match = mdio_bus_match, |
450 | .pm = MDIO_BUS_PM_OPS, | 452 | .pm = MDIO_BUS_PM_OPS, |
451 | .dev_attrs = mdio_dev_attrs, | 453 | .dev_groups = mdio_dev_groups, |
452 | }; | 454 | }; |
453 | EXPORT_SYMBOL(mdio_bus_type); | 455 | EXPORT_SYMBOL(mdio_bus_type); |
454 | 456 | ||