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

net: dsa: mv88e6xxx: remove mv88e6250_ptp_ops 



mv88e6250_ptp_ops and mv88e6352_ptp_ops are identical since commit
7e3c1809 ("net: dsa: mv88e6xxx: read cycle counter period from
hardware"). Remove the unnecessary duplication.

Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uweou-00000004ik1-0aiX@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 010fe36a

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -5088,7 +5088,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { 
	.vtu_getnext = mv88e6185_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,

	.avb_ops = &mv88e6352_avb_ops,

	.ptp_ops = &mv88e6250_ptp_ops,

	.ptp_ops = &mv88e6352_ptp_ops,

	.phylink_get_caps = mv88e6250_phylink_get_caps,

	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,

};

drivers/net/dsa/mv88e6xxx/ptp.c

+0 −23
Original line number Diff line number Diff line
@@ -413,29 +413,6 @@ const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = { 
		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {

	.clock_read = mv88e6352_ptp_clock_read,

	.ptp_enable = mv88e6352_ptp_enable,

	.ptp_verify = mv88e6352_ptp_verify,

	.event_work = mv88e6352_tai_event_work,

	.port_enable = mv88e6352_hwtstamp_port_enable,

	.port_disable = mv88e6352_hwtstamp_port_disable,

	.n_ext_ts = 1,

	.arr0_sts_reg = MV88E6XXX_PORT_PTP_ARR0_STS,

	.arr1_sts_reg = MV88E6XXX_PORT_PTP_ARR1_STS,

	.dep_sts_reg = MV88E6XXX_PORT_PTP_DEP_STS,

	.rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {

	.clock_read = mv88e6352_ptp_clock_read,

	.ptp_enable = mv88e6352_ptp_enable,

drivers/net/dsa/mv88e6xxx/ptp.h

+0 −2
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip); 
				      ptp_clock_info)



extern const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops;
@@ -170,7 +169,6 @@ static inline void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip) 
}



static const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {};