Commit abec4be3 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

net: ethernet: stmmac: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80c5a20b

drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c

+10 −12
Original line number Diff line number Diff line
@@ -118,10 +118,9 @@ int tse_pcs_init(void __iomem *base, struct tse_pcs *pcs) 
	return ret;

}



static void pcs_link_timer_callback(unsigned long data)

static void pcs_link_timer_callback(struct tse_pcs *pcs)

{

	u16 val = 0;

	struct tse_pcs *pcs = (struct tse_pcs *)data;

	void __iomem *tse_pcs_base = pcs->tse_pcs_base;

	void __iomem *sgmii_adapter_base = pcs->sgmii_adapter_base;
@@ -138,12 +137,11 @@ static void pcs_link_timer_callback(unsigned long data) 
	}

}



static void auto_nego_timer_callback(unsigned long data)

static void auto_nego_timer_callback(struct tse_pcs *pcs)

{

	u16 val = 0;

	u16 speed = 0;

	u16 duplex = 0;

	struct tse_pcs *pcs = (struct tse_pcs *)data;

	void __iomem *tse_pcs_base = pcs->tse_pcs_base;

	void __iomem *sgmii_adapter_base = pcs->sgmii_adapter_base;
@@ -201,14 +199,14 @@ static void auto_nego_timer_callback(unsigned long data) 
	}

}



static void aneg_link_timer_callback(unsigned long data)

static void aneg_link_timer_callback(struct timer_list *t)

{

	struct tse_pcs *pcs = (struct tse_pcs *)data;

	struct tse_pcs *pcs = from_timer(pcs, t, aneg_link_timer);



	if (pcs->autoneg == AUTONEG_ENABLE)

		auto_nego_timer_callback(data);

		auto_nego_timer_callback(pcs);

	else if (pcs->autoneg == AUTONEG_DISABLE)

		pcs_link_timer_callback(data);

		pcs_link_timer_callback(pcs);

}



void tse_pcs_fix_mac_speed(struct tse_pcs *pcs, struct phy_device *phy_dev,
@@ -237,8 +235,8 @@ void tse_pcs_fix_mac_speed(struct tse_pcs *pcs, struct phy_device *phy_dev, 


		tse_pcs_reset(tse_pcs_base, pcs);



		setup_timer(&pcs->aneg_link_timer,

			    aneg_link_timer_callback, (unsigned long)pcs);

		timer_setup(&pcs->aneg_link_timer, aneg_link_timer_callback,

			    0);

		mod_timer(&pcs->aneg_link_timer, jiffies +

			  msecs_to_jiffies(AUTONEGO_LINK_TIMER));

	} else if (phy_dev->autoneg == AUTONEG_DISABLE) {
@@ -270,8 +268,8 @@ void tse_pcs_fix_mac_speed(struct tse_pcs *pcs, struct phy_device *phy_dev, 


		tse_pcs_reset(tse_pcs_base, pcs);



		setup_timer(&pcs->aneg_link_timer,

			    aneg_link_timer_callback, (unsigned long)pcs);

		timer_setup(&pcs->aneg_link_timer, aneg_link_timer_callback,

			    0);

		mod_timer(&pcs->aneg_link_timer, jiffies +

			  msecs_to_jiffies(AUTONEGO_LINK_TIMER));

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE