Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19557966 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: mvmdio: put the poll intervals in the ops structure 



Put the two poll intervals (min and max) in the driver's ops
structure. This is needed to add the xmdio support later.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0b7fa4f

drivers/net/ethernet/marvell/mvmdio.c

+6 −2
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ struct orion_mdio_dev { 


struct orion_mdio_ops {

	int (*is_done)(struct orion_mdio_dev *);

	unsigned int poll_interval_min;

	unsigned int poll_interval_max;

};



/* Wait for the SMI unit to be ready for another operation
@@ -83,8 +85,8 @@ static int orion_mdio_wait_ready(const struct orion_mdio_ops *ops, 
			break;



	        if (dev->err_interrupt <= 0) {

			usleep_range(MVMDIO_SMI_POLL_INTERVAL_MIN,

				     MVMDIO_SMI_POLL_INTERVAL_MAX);

			usleep_range(ops->poll_interval_min,

				     ops->poll_interval_max);



			if (time_is_before_jiffies(end))

				++timedout;
@@ -113,6 +115,8 @@ static int orion_mdio_smi_is_done(struct orion_mdio_dev *dev) 


static const struct orion_mdio_ops orion_mdio_smi_ops = {

	.is_done = orion_mdio_smi_is_done,

	.poll_interval_min = MVMDIO_SMI_POLL_INTERVAL_MIN,

	.poll_interval_max = MVMDIO_SMI_POLL_INTERVAL_MAX,

};



static int orion_mdio_read(struct mii_bus *bus, int mii_id,