|
@@ -1,7 +1,4 @@
|
|
|
-/*
|
|
|
- * drivers/net/phy/mdio_bus.c
|
|
|
- *
|
|
|
- * MDIO Bus interface
|
|
|
+/* MDIO Bus interface
|
|
|
*
|
|
|
* Author: Andy Fleming
|
|
|
*
|
|
@@ -36,10 +33,10 @@
|
|
|
#include <linux/mii.h>
|
|
|
#include <linux/ethtool.h>
|
|
|
#include <linux/phy.h>
|
|
|
+#include <linux/io.h>
|
|
|
+#include <linux/uaccess.h>
|
|
|
|
|
|
-#include <asm/io.h>
|
|
|
#include <asm/irq.h>
|
|
|
-#include <asm/uaccess.h>
|
|
|
|
|
|
/**
|
|
|
* mdiobus_alloc_size - allocate a mii_bus structure
|
|
@@ -139,8 +136,7 @@ int mdiobus_register(struct mii_bus *bus)
|
|
|
int i, err;
|
|
|
|
|
|
if (NULL == bus || NULL == bus->name ||
|
|
|
- NULL == bus->read ||
|
|
|
- NULL == bus->write)
|
|
|
+ NULL == bus->read || NULL == bus->write)
|
|
|
return -EINVAL;
|
|
|
|
|
|
BUG_ON(bus->state != MDIOBUS_ALLOCATED &&
|
|
@@ -214,9 +210,7 @@ EXPORT_SYMBOL(mdiobus_unregister);
|
|
|
*/
|
|
|
void mdiobus_free(struct mii_bus *bus)
|
|
|
{
|
|
|
- /*
|
|
|
- * For compatibility with error handling in drivers.
|
|
|
- */
|
|
|
+ /* For compatibility with error handling in drivers. */
|
|
|
if (bus->state == MDIOBUS_ALLOCATED) {
|
|
|
kfree(bus);
|
|
|
return;
|
|
@@ -335,15 +329,13 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
|
|
|
if (!netdev)
|
|
|
return true;
|
|
|
|
|
|
- /*
|
|
|
- * Don't suspend PHY if the attched netdev parent may wakeup.
|
|
|
+ /* Don't suspend PHY if the attched netdev parent may wakeup.
|
|
|
* The parent may point to a PCI device, as in tg3 driver.
|
|
|
*/
|
|
|
if (netdev->dev.parent && device_may_wakeup(netdev->dev.parent))
|
|
|
return false;
|
|
|
|
|
|
- /*
|
|
|
- * Also don't suspend PHY if the netdev itself may wakeup. This
|
|
|
+ /* Also don't suspend PHY if the netdev itself may wakeup. This
|
|
|
* is the case for devices w/o underlaying pwr. mgmt. aware bus,
|
|
|
* e.g. SoC devices.
|
|
|
*/
|
|
@@ -358,8 +350,7 @@ static int mdio_bus_suspend(struct device *dev)
|
|
|
struct phy_driver *phydrv = to_phy_driver(dev->driver);
|
|
|
struct phy_device *phydev = to_phy_device(dev);
|
|
|
|
|
|
- /*
|
|
|
- * We must stop the state machine manually, otherwise it stops out of
|
|
|
+ /* We must stop the state machine manually, otherwise it stops out of
|
|
|
* control, possibly with the phydev->lock held. Upon resume, netdev
|
|
|
* may call phy routines that try to grab the same lock, and that may
|
|
|
* lead to a deadlock.
|
|
@@ -415,7 +406,7 @@ static int mdio_bus_restore(struct device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static struct dev_pm_ops mdio_bus_pm_ops = {
|
|
|
+static const struct dev_pm_ops mdio_bus_pm_ops = {
|
|
|
.suspend = mdio_bus_suspend,
|
|
|
.resume = mdio_bus_resume,
|
|
|
.freeze = mdio_bus_suspend,
|