@@ -631,7 +631,6 @@ static void recalibrate(struct dp83640_clock *clock)
631631 s64 now , diff ;
632632 struct phy_txts event_ts ;
633633 struct timespec64 ts ;
634- struct list_head * this ;
635634 struct dp83640_private * tmp ;
636635 struct phy_device * master = clock -> chosen -> phydev ;
637636 u16 cal_gpio , cfg0 , evnt , ptp_trig , trigger , val ;
@@ -648,8 +647,7 @@ static void recalibrate(struct dp83640_clock *clock)
648647 /*
649648 * enable broadcast, disable status frames, enable ptp clock
650649 */
651- list_for_each (this , & clock -> phylist ) {
652- tmp = list_entry (this , struct dp83640_private , list );
650+ list_for_each_entry (tmp , & clock -> phylist , list ) {
653651 enable_broadcast (tmp -> phydev , clock -> page , 1 );
654652 tmp -> cfg0 = ext_read (tmp -> phydev , PAGE5 , PSF_CFG0 );
655653 ext_write (0 , tmp -> phydev , PAGE5 , PSF_CFG0 , 0 );
@@ -667,10 +665,8 @@ static void recalibrate(struct dp83640_clock *clock)
667665 evnt |= (CAL_EVENT & EVNT_SEL_MASK ) << EVNT_SEL_SHIFT ;
668666 evnt |= (cal_gpio & EVNT_GPIO_MASK ) << EVNT_GPIO_SHIFT ;
669667
670- list_for_each (this , & clock -> phylist ) {
671- tmp = list_entry (this , struct dp83640_private , list );
668+ list_for_each_entry (tmp , & clock -> phylist , list )
672669 ext_write (0 , tmp -> phydev , PAGE5 , PTP_EVNT , evnt );
673- }
674670 ext_write (0 , master , PAGE5 , PTP_EVNT , evnt );
675671
676672 /*
@@ -709,8 +705,7 @@ static void recalibrate(struct dp83640_clock *clock)
709705 event_ts .sec_hi = ext_read (master , PAGE4 , PTP_EDATA );
710706 now = phy2txts (& event_ts );
711707
712- list_for_each (this , & clock -> phylist ) {
713- tmp = list_entry (this , struct dp83640_private , list );
708+ list_for_each_entry (tmp , & clock -> phylist , list ) {
714709 val = ext_read (tmp -> phydev , PAGE4 , PTP_STS );
715710 phydev_info (tmp -> phydev , "slave PTP_STS 0x%04hx\n" , val );
716711 val = ext_read (tmp -> phydev , PAGE4 , PTP_ESTS );
@@ -730,10 +725,8 @@ static void recalibrate(struct dp83640_clock *clock)
730725 /*
731726 * restore status frames
732727 */
733- list_for_each (this , & clock -> phylist ) {
734- tmp = list_entry (this , struct dp83640_private , list );
728+ list_for_each_entry (tmp , & clock -> phylist , list )
735729 ext_write (0 , tmp -> phydev , PAGE5 , PSF_CFG0 , tmp -> cfg0 );
736- }
737730 ext_write (0 , master , PAGE5 , PSF_CFG0 , cfg0 );
738731
739732 mutex_unlock (& clock -> extreg_lock );
0 commit comments