OSDN Git Service

ptp: ptp_ines: use new PTP_MSGTYPE_* define(s)
authorChristian Eggers <ceggers@arri.de>
Fri, 20 Nov 2020 08:41:06 +0000 (09:41 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 23 Nov 2020 21:43:39 +0000 (13:43 -0800)
Remove driver internal defines for this. Masking msgtype with 0xf is
already done within ptp_get_msgtype().

Signed-off-by: Christian Eggers <ceggers@arri.de>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_ines.c

index 4700ffb..6c7c284 100644 (file)
@@ -108,11 +108,6 @@ MODULE_LICENSE("GPL");
 #define MESSAGE_TYPE_P_DELAY_RESP      3
 #define MESSAGE_TYPE_DELAY_REQ         4
 
-#define SYNC                           0x0
-#define DELAY_REQ                      0x1
-#define PDELAY_REQ                     0x2
-#define PDELAY_RESP                    0x3
-
 static LIST_HEAD(ines_clocks);
 static DEFINE_MUTEX(ines_clocks_lock);
 
@@ -683,9 +678,9 @@ static bool is_sync_pdelay_resp(struct sk_buff *skb, int type)
 
        msgtype = ptp_get_msgtype(hdr, type);
 
-       switch ((msgtype & 0xf)) {
-       case SYNC:
-       case PDELAY_RESP:
+       switch (msgtype) {
+       case PTP_MSGTYPE_SYNC:
+       case PTP_MSGTYPE_PDELAY_RESP:
                return true;
        default:
                return false;
@@ -696,13 +691,13 @@ static u8 tag_to_msgtype(u8 tag)
 {
        switch (tag) {
        case MESSAGE_TYPE_SYNC:
-               return SYNC;
+               return PTP_MSGTYPE_SYNC;
        case MESSAGE_TYPE_P_DELAY_REQ:
-               return PDELAY_REQ;
+               return PTP_MSGTYPE_PDELAY_REQ;
        case MESSAGE_TYPE_P_DELAY_RESP:
-               return PDELAY_RESP;
+               return PTP_MSGTYPE_PDELAY_RESP;
        case MESSAGE_TYPE_DELAY_REQ:
-               return DELAY_REQ;
+               return PTP_MSGTYPE_DELAY_REQ;
        }
        return 0xf;
 }