Commit 30cf6a87 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: dsa: mv88e6xxx: remove duplicated register definition 



There are two identical MV88E6XXX_PTP_GC_ETYPE definitions in ptp.h,
and MV88E6XXX_PTP_ETHERTYPE in hwtstamp.h which all refer to the
exact same register. As the code that accesses this register is in
hwtstamp.c, use the hwtstamp.h definition, and remove the
unnecessary duplicated definition in ptp.h

Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 946fc083

drivers/net/dsa/mv88e6xxx/hwtstamp.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip) 
	}



	/* Set the ethertype of L2 PTP messages */

	err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_GC_ETYPE, ETH_P_1588);

	err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_ETHERTYPE, ETH_P_1588);

	if (err)

		return err;

drivers/net/dsa/mv88e6xxx/ptp.h

+0 −6
Original line number Diff line number Diff line
@@ -44,13 +44,7 @@ 
#define MV88E6352_TAI_TIME_LO			0x0e

#define MV88E6352_TAI_TIME_HI			0x0f



/* Offset 0x00: Ether Type */

#define MV88E6XXX_PTP_GC_ETYPE			0x00



/* 6165 Global Control Registers */

/* Offset 0x00: Ether Type */

#define MV88E6XXX_PTP_GC_ETYPE			0x00



/* Offset 0x01: Message ID */

#define MV88E6XXX_PTP_GC_MESSAGE_ID		0x01