dp83640: Use list_for_each_entry() helper

[linux-2.6-microblaze.git] / drivers / net / phy / dp83640.c

diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index ef8b141..2657be7 100644 (file)
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -631,7 +631,6 @@ static void recalibrate(struct dp83640_clock *clock)
        s64 now, diff;
        struct phy_txts event_ts;
        struct timespec64 ts;
-       struct list_head *this;
        struct dp83640_private *tmp;
        struct phy_device *master = clock->chosen->phydev;
        u16 cal_gpio, cfg0, evnt, ptp_trig, trigger, val;
@@ -648,8 +647,7 @@ static void recalibrate(struct dp83640_clock *clock)
        /*
         * enable broadcast, disable status frames, enable ptp clock
         */
-       list_for_each(this, &clock->phylist) {
-               tmp = list_entry(this, struct dp83640_private, list);
+       list_for_each_entry(tmp, &clock->phylist, list) {
                enable_broadcast(tmp->phydev, clock->page, 1);
                tmp->cfg0 = ext_read(tmp->phydev, PAGE5, PSF_CFG0);
                ext_write(0, tmp->phydev, PAGE5, PSF_CFG0, 0);
@@ -667,10 +665,8 @@ static void recalibrate(struct dp83640_clock *clock)
        evnt |= (CAL_EVENT & EVNT_SEL_MASK) << EVNT_SEL_SHIFT;
        evnt |= (cal_gpio & EVNT_GPIO_MASK) << EVNT_GPIO_SHIFT;
 
-       list_for_each(this, &clock->phylist) {
-               tmp = list_entry(this, struct dp83640_private, list);
+       list_for_each_entry(tmp, &clock->phylist, list)
                ext_write(0, tmp->phydev, PAGE5, PTP_EVNT, evnt);
-       }
        ext_write(0, master, PAGE5, PTP_EVNT, evnt);
 
        /*
@@ -709,8 +705,7 @@ static void recalibrate(struct dp83640_clock *clock)
        event_ts.sec_hi = ext_read(master, PAGE4, PTP_EDATA);
        now = phy2txts(&event_ts);
 
-       list_for_each(this, &clock->phylist) {
-               tmp = list_entry(this, struct dp83640_private, list);
+       list_for_each_entry(tmp, &clock->phylist, list) {
                val = ext_read(tmp->phydev, PAGE4, PTP_STS);
                phydev_info(tmp->phydev, "slave  PTP_STS  0x%04hx\n", val);
                val = ext_read(tmp->phydev, PAGE4, PTP_ESTS);
@@ -730,10 +725,8 @@ static void recalibrate(struct dp83640_clock *clock)
        /*
         * restore status frames
         */
-       list_for_each(this, &clock->phylist) {
-               tmp = list_entry(this, struct dp83640_private, list);
+       list_for_each_entry(tmp, &clock->phylist, list)
                ext_write(0, tmp->phydev, PAGE5, PSF_CFG0, tmp->cfg0);
-       }
        ext_write(0, master, PAGE5, PSF_CFG0, cfg0);
 
        mutex_unlock(&clock->extreg_lock);