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

Commit d11437e0 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phy: convert micrel to new read_mmd/write_mmd driver methods 



Convert micrel to the new read_mmd/write_mmd driver methods.  This
Clause 22 PHY does not support any MMD access method.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6d99fcd

drivers/net/phy/micrel.c

+6 −7
Original line number Diff line number Diff line
@@ -637,8 +637,7 @@ static int ksz8873mll_config_aneg(struct phy_device *phydev) 
 * MMD extended PHY registers.

 */

static int

ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,

		      int regnum)

ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int devad, u16 regnum)

{

	return -1;

}
@@ -646,10 +645,10 @@ ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum, 
/* This routine does nothing since the Micrel ksz9021 does not support

 * standard IEEE MMD extended PHY registers.

 */

static void

ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,

		      int regnum, u32 val)

static int

ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int devad, u16 regnum, u16 val)

{

	return -1;

}



static int kszphy_get_sset_count(struct phy_device *phydev)
@@ -962,8 +961,8 @@ static struct phy_driver ksphy_driver[] = { 
	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

	.read_mmd_indirect = ksz9021_rd_mmd_phyreg,

	.write_mmd_indirect = ksz9021_wr_mmd_phyreg,

	.read_mmd	= ksz9021_rd_mmd_phyreg,

	.write_mmd	= ksz9021_wr_mmd_phyreg,

}, {

	.phy_id		= PHY_ID_KSZ9031,

	.phy_id_mask	= MICREL_PHY_ID_MASK,