Instead of passing a pointer to the ptp_clock_info structure, pass a pointer to mv88e6xxx_chip instead. This allows the transition to the generic marvell PTP library easier. Signed-off-by: Russell King (Oracle) --- drivers/net/dsa/mv88e6xxx/hwtstamp.c | 3 +-- drivers/net/dsa/mv88e6xxx/hwtstamp.h | 2 +- drivers/net/dsa/mv88e6xxx/ptp.c | 7 ++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c index 6e6472a3b75a..ba989d699113 100644 --- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c +++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c @@ -439,9 +439,8 @@ static int mv88e6xxx_txtstamp_work(struct mv88e6xxx_chip *chip, return 0; } -long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) +long mv88e6xxx_hwtstamp_work(struct mv88e6xxx_chip *chip) { - struct mv88e6xxx_chip *chip = ptp_to_chip(ptp); struct dsa_switch *ds = chip->ds; struct mv88e6xxx_port_hwtstamp *ps; int i, restart = 0; diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.h b/drivers/net/dsa/mv88e6xxx/hwtstamp.h index c359821d5a6e..747351d59921 100644 --- a/drivers/net/dsa/mv88e6xxx/hwtstamp.h +++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.h @@ -124,7 +124,7 @@ void mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port, int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port, struct kernel_ethtool_ts_info *info); -long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp); +long mv88e6xxx_hwtstamp_work(struct mv88e6xxx_chip *chip); int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip); void mv88e6xxx_hwtstamp_free(struct mv88e6xxx_chip *chip); int mv88e6352_hwtstamp_port_enable(struct mv88e6xxx_chip *chip, int port); diff --git a/drivers/net/dsa/mv88e6xxx/ptp.c b/drivers/net/dsa/mv88e6xxx/ptp.c index 43c4af82cb1c..03f30424ba97 100644 --- a/drivers/net/dsa/mv88e6xxx/ptp.c +++ b/drivers/net/dsa/mv88e6xxx/ptp.c @@ -503,6 +503,11 @@ static void mv88e6xxx_ptp_overflow_check(struct work_struct *work) MV88E6XXX_TAI_OVERFLOW_PERIOD); } +static long mv88e6xxx_ptp_aux_work(struct ptp_clock_info *ptp) +{ + return mv88e6xxx_hwtstamp_work(ptp_to_chip(ptp)); +} + int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip) { const struct mv88e6xxx_ptp_ops *ptp_ops = chip->info->ops->ptp_ops; @@ -551,7 +556,7 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip) chip->ptp_clock_info.settime64 = mv88e6xxx_ptp_settime; chip->ptp_clock_info.enable = mv88e6xxx_ptp_enable; chip->ptp_clock_info.verify = mv88e6xxx_ptp_verify; - chip->ptp_clock_info.do_aux_work = mv88e6xxx_hwtstamp_work; + chip->ptp_clock_info.do_aux_work = mv88e6xxx_ptp_aux_work; chip->ptp_clock_info.supported_extts_flags = PTP_RISING_EDGE | PTP_FALLING_EDGE | -- 2.47.3