Merge branch 'phy-add-helpers-for-setting-clearing-bits-in-PHY-registers'

davem330 · davem330 · commit ccc27fcb8b59 · 2018-01-16T12:25:11.000-05:00
Heiner Kallweit says:

====================
phy: add helpers for setting/clearing bits in PHY registers

Based on the recent introduction of phy_modify add helpers for setting
and clearing bits in PHY registers. First user is phylib.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
@@ -1660,13 +1660,13 @@ EXPORT_SYMBOL(genphy_config_init);
 
 int genphy_suspend(struct phy_device *phydev)
 {
-	return phy_modify(phydev, MII_BMCR, 0, BMCR_PDOWN);
+	return phy_set_bits(phydev, MII_BMCR, BMCR_PDOWN);
 }
 EXPORT_SYMBOL(genphy_suspend);
 
 int genphy_resume(struct phy_device *phydev)
 {
-	return phy_modify(phydev, MII_BMCR, BMCR_PDOWN, 0);
+	return phy_clear_bits(phydev, MII_BMCR, BMCR_PDOWN);
 }
 EXPORT_SYMBOL(genphy_resume);
 
diff --git a/include/linux/phy.h b/include/linux/phy.h
@@ -764,6 +764,55 @@ static inline int __phy_write(struct phy_device *phydev, u32 regnum, u16 val)
 int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set);
 int phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set);
 
+/**
+ * __phy_set_bits - Convenience function for setting bits in a PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+ * @val: bits to set
+ *
+ * The caller must have taken the MDIO bus lock.
+ */
+static inline int __phy_set_bits(struct phy_device *phydev, u32 regnum, u16 val)
+{
+	return __phy_modify(phydev, regnum, 0, val);
+}
+
+/**
+ * __phy_clear_bits - Convenience function for clearing bits in a PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+ * @val: bits to clear
+ *
+ * The caller must have taken the MDIO bus lock.
+ */
+static inline int __phy_clear_bits(struct phy_device *phydev, u32 regnum,
+				   u16 val)
+{
+	return __phy_modify(phydev, regnum, val, 0);
+}
+
+/**
+ * phy_set_bits - Convenience function for setting bits in a PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+ * @val: bits to set
+ */
+static inline int phy_set_bits(struct phy_device *phydev, u32 regnum, u16 val)
+{
+	return phy_modify(phydev, regnum, 0, val);
+}
+
+/**
+ * phy_clear_bits - Convenience function for clearing bits in a PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+ * @val: bits to clear
+ */
+static inline int phy_clear_bits(struct phy_device *phydev, u32 regnum, u16 val)
+{
+	return phy_modify(phydev, regnum, val, 0);
+}
+
 /**
  * phy_interrupt_is_valid - Convenience function for testing a given PHY irq
  * @phydev: the phy_device struct

Original file line number	Diff line number	Diff line change
`@@ -1660,13 +1660,13 @@ EXPORT_SYMBOL(genphy_config_init);`
`1660`	`1660`
`1661`	`1661`	`int genphy_suspend(struct phy_device *phydev)`
`1662`	`1662`	`{`
`1663`		`- return phy_modify(phydev, MII_BMCR, 0, BMCR_PDOWN);`
	`1663`	`+ return phy_set_bits(phydev, MII_BMCR, BMCR_PDOWN);`
`1664`	`1664`	`}`
`1665`	`1665`	`EXPORT_SYMBOL(genphy_suspend);`
`1666`	`1666`
`1667`	`1667`	`int genphy_resume(struct phy_device *phydev)`
`1668`	`1668`	`{`
`1669`		`- return phy_modify(phydev, MII_BMCR, BMCR_PDOWN, 0);`
	`1669`	`+ return phy_clear_bits(phydev, MII_BMCR, BMCR_PDOWN);`
`1670`	`1670`	`}`
`1671`	`1671`	`EXPORT_SYMBOL(genphy_resume);`
`1672`	`1672`