Re: [PATCH net-next v2 3/3] ptp: ptp_ines: use new PTP_MSGTYPE_* define(s)

Jacob Keller
2020-11-18T21:04:02Z

On 11/18/2020 8:22 AM, Christian Eggers wrote:
> Remove driver internal defines for this.
>
> Signed-off-by: Christian Eggers <ceggers@arri.de>
> Cc: Richard Cochran <richardcochran@gmail.com>
> Cc: Kurt Kanzenbach <kurt@linutronix.de>
> ---
> drivers/ptp/ptp_ines.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c
> index 4700ffbdfced..6c7c2843ba0b 100644
> --- a/drivers/ptp/ptp_ines.c
> +++ b/drivers/ptp/ptp_ines.c
> @@ -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:

This has a functional change of no longer discarding the higher bits of
msgtype. While this may be correct, I think it should at least be called
out as to why in the commit message.

> 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;
> }
>