net: phy: mscc: use new PTP_MSGTYPE_* defines
authorChristian Eggers <ceggers@arri.de>
Tue, 24 Nov 2020 07:44:18 +0000 (08:44 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 25 Nov 2020 20:23:21 +0000 (12:23 -0800)
Use recently introduced PTP_MSGTYPE_SYNC and PTP_MSGTYPE_DELAY_REQ
defines instead of a driver internal enumeration.

Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/mscc/mscc_ptp.c
drivers/net/phy/mscc/mscc_ptp.h

index d8a6145..924ed5b 100644 (file)
@@ -506,9 +506,9 @@ static int vsc85xx_ptp_cmp_init(struct phy_device *phydev, enum ts_blk blk)
 {
        struct vsc8531_private *vsc8531 = phydev->priv;
        bool base = phydev->mdio.addr == vsc8531->ts_base_addr;
-       enum vsc85xx_ptp_msg_type msgs[] = {
-               PTP_MSG_TYPE_SYNC,
-               PTP_MSG_TYPE_DELAY_REQ
+       u8 msgs[] = {
+               PTP_MSGTYPE_SYNC,
+               PTP_MSGTYPE_DELAY_REQ
        };
        u32 val;
        u8 i;
@@ -847,9 +847,9 @@ static int vsc85xx_ts_ptp_action_flow(struct phy_device *phydev, enum ts_blk blk
 static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,
                            bool one_step, bool enable)
 {
-       enum vsc85xx_ptp_msg_type msgs[] = {
-               PTP_MSG_TYPE_SYNC,
-               PTP_MSG_TYPE_DELAY_REQ
+       u8 msgs[] = {
+               PTP_MSGTYPE_SYNC,
+               PTP_MSGTYPE_DELAY_REQ
        };
        u32 val;
        u8 i;
@@ -858,7 +858,7 @@ static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,
                if (blk == INGRESS)
                        vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],
                                                   PTP_WRITE_NS);
-               else if (msgs[i] == PTP_MSG_TYPE_SYNC && one_step)
+               else if (msgs[i] == PTP_MSGTYPE_SYNC && one_step)
                        /* no need to know Sync t when sending in one_step */
                        vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],
                                                   PTP_WRITE_1588);
index 3ea163a..da34653 100644 (file)
@@ -436,11 +436,6 @@ enum ptp_cmd {
        PTP_SAVE_IN_TS_FIFO = 11, /* invalid when writing in reg */
 };
 
-enum vsc85xx_ptp_msg_type {
-       PTP_MSG_TYPE_SYNC,
-       PTP_MSG_TYPE_DELAY_REQ,
-};
-
 struct vsc85xx_ptphdr {
        u8 tsmt; /* transportSpecific | messageType */
        u8 ver;  /* reserved0 | versionPTP */