UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers/net: sis: 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: Francois Romieu <romieu@fr.zoreil.com>
Cc: Daniele Venzano <venza@brownhat.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Daniele Venzano <venza@brownhat.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-24 01:46:52 -07:00 committed by David S. Miller
parent 5c658e19a7
commit fd71e13bc7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/sis/sis190.c
View File

@ -1018,10 +1018,10 @@ out_unlock:
rtnl_unlock(); rtnl_unlock();
} }
static void sis190_phy_timer(unsigned long __opaque) static void sis190_phy_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)__opaque; struct sis190_private *tp = from_timer(tp, t, timer);
struct sis190_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
if (likely(netif_running(dev))) if (likely(netif_running(dev)))
schedule_work(&tp->phy_task); schedule_work(&tp->phy_task);
@ -1039,10 +1039,8 @@ static inline void sis190_request_timer(struct net_device *dev)
struct sis190_private *tp = netdev_priv(dev); struct sis190_private *tp = netdev_priv(dev);
struct timer_list *timer = &tp->timer; struct timer_list *timer = &tp->timer;
init_timer(timer); timer_setup(timer, sis190_phy_timer, 0);
timer->expires = jiffies + SIS190_PHY_TIMEOUT; timer->expires = jiffies + SIS190_PHY_TIMEOUT;
timer->data = (unsigned long)dev;
timer->function = sis190_phy_timer;
add_timer(timer); add_timer(timer);
} }

10
drivers/net/ethernet/sis/sis900.c
View File

@ -218,7 +218,7 @@ static void sis900_init_rxfilter (struct net_device * net_dev);
static u16 read_eeprom(void __iomem *ioaddr, int location); static u16 read_eeprom(void __iomem *ioaddr, int location);
static int mdio_read(struct net_device *net_dev, int phy_id, int location); static int mdio_read(struct net_device *net_dev, int phy_id, int location);
static void mdio_write(struct net_device *net_dev, int phy_id, int location, int val); static void mdio_write(struct net_device *net_dev, int phy_id, int location, int val);
static void sis900_timer(unsigned long data); static void sis900_timer(struct timer_list *t);
static void sis900_check_mode (struct net_device *net_dev, struct mii_phy *mii_phy); static void sis900_check_mode (struct net_device *net_dev, struct mii_phy *mii_phy);
static void sis900_tx_timeout(struct net_device *net_dev); static void sis900_tx_timeout(struct net_device *net_dev);
static void sis900_init_tx_ring(struct net_device *net_dev); static void sis900_init_tx_ring(struct net_device *net_dev);
@ -1065,7 +1065,7 @@ sis900_open(struct net_device *net_dev)
/* Set the timer to switch to check for link beat and perhaps switch /* Set the timer to switch to check for link beat and perhaps switch
to an alternate media type. */ to an alternate media type. */
setup_timer(&sis_priv->timer, sis900_timer, (unsigned long)net_dev); timer_setup(&sis_priv->timer, sis900_timer, 0);
sis_priv->timer.expires = jiffies + HZ; sis_priv->timer.expires = jiffies + HZ;
add_timer(&sis_priv->timer); add_timer(&sis_priv->timer);
@ -1300,10 +1300,10 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision)
* link status (ON/OFF) and link mode (10/100/Full/Half) * link status (ON/OFF) and link mode (10/100/Full/Half)
*/ */
static void sis900_timer(unsigned long data) static void sis900_timer(struct timer_list *t)
{ {
struct net_device *net_dev = (struct net_device *)data; struct sis900_private *sis_priv = from_timer(sis_priv, t, timer);
struct sis900_private *sis_priv = netdev_priv(net_dev); struct net_device *net_dev = sis_priv->mii_info.dev;
struct mii_phy *mii_phy = sis_priv->mii; struct mii_phy *mii_phy = sis_priv->mii;
static const int next_tick = 5*HZ; static const int next_tick = 5*HZ;
int speed = 0, duplex = 0; int speed = 0, duplex = 0;