Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: microchip: use delayed_work instead of timer + work

Browse Source 
Simplify ksz_common.c by using delayed_work instead of a combination of
timer and work.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
George McCollister 2020-03-10 12:58:59 -05:00 committed by David S. Miller
parent 377bb76444
commit 469b390e1b
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/dsa/microchip/ksz_common.c
View File

@ -67,7 +67,7 @@ static void port_r_cnt(struct ksz_device *dev, int port)
static void ksz_mib_read_work(struct work_struct *work) static void ksz_mib_read_work(struct work_struct *work)
{ {
struct ksz_device *dev = container_of(work, struct ksz_device, struct ksz_device *dev = container_of(work, struct ksz_device,
mib_read); mib_read.work);
struct ksz_port_mib *mib; struct ksz_port_mib *mib;
struct ksz_port *p; struct ksz_port *p;
int i; int i;
@ -93,32 +93,24 @@ static void ksz_mib_read_work(struct work_struct *work)
p->read = false; p->read = false;
mutex_unlock(&mib->cnt_mutex); mutex_unlock(&mib->cnt_mutex);
} }
}
static void mib_monitor(struct timer_list *t) schedule_delayed_work(&dev->mib_read, dev->mib_read_interval);
{
struct ksz_device *dev = from_timer(dev, t, mib_read_timer);
mod_timer(&dev->mib_read_timer, jiffies + dev->mib_read_interval);
schedule_work(&dev->mib_read);
} }
void ksz_init_mib_timer(struct ksz_device *dev) void ksz_init_mib_timer(struct ksz_device *dev)
{ {
int i; int i;
INIT_DELAYED_WORK(&dev->mib_read, ksz_mib_read_work);
/* Read MIB counters every 30 seconds to avoid overflow. */ /* Read MIB counters every 30 seconds to avoid overflow. */
dev->mib_read_interval = msecs_to_jiffies(30000); dev->mib_read_interval = msecs_to_jiffies(30000);
INIT_WORK(&dev->mib_read, ksz_mib_read_work);
timer_setup(&dev->mib_read_timer, mib_monitor, 0);
for (i = 0; i < dev->mib_port_cnt; i++) for (i = 0; i < dev->mib_port_cnt; i++)
dev->dev_ops->port_init_cnt(dev, i); dev->dev_ops->port_init_cnt(dev, i);
/* Start the timer 2 seconds later. */ /* Start the timer 2 seconds later. */
dev->mib_read_timer.expires = jiffies + msecs_to_jiffies(2000); schedule_delayed_work(&dev->mib_read, msecs_to_jiffies(2000));
add_timer(&dev->mib_read_timer);
} }
EXPORT_SYMBOL_GPL(ksz_init_mib_timer); EXPORT_SYMBOL_GPL(ksz_init_mib_timer);
@ -152,7 +144,7 @@ void ksz_adjust_link(struct dsa_switch *ds, int port,
/* Read all MIB counters when the link is going down. */ /* Read all MIB counters when the link is going down. */
if (!phydev->link) { if (!phydev->link) {
p->read = true; p->read = true;
schedule_work(&dev->mib_read); schedule_delayed_work(&dev->mib_read, 0);
} }
mutex_lock(&dev->dev_mutex); mutex_lock(&dev->dev_mutex);
if (!phydev->link) if (!phydev->link)
@ -477,10 +469,8 @@ EXPORT_SYMBOL(ksz_switch_register);
void ksz_switch_remove(struct ksz_device *dev) void ksz_switch_remove(struct ksz_device *dev)
{ {
/* timer started */ /* timer started */
if (dev->mib_read_timer.expires) { if (dev->mib_read_interval)
del_timer_sync(&dev->mib_read_timer); cancel_delayed_work_sync(&dev->mib_read);
flush_work(&dev->mib_read);
}
dev->dev_ops->exit(dev); dev->dev_ops->exit(dev);
dsa_unregister_switch(dev->ds); dsa_unregister_switch(dev->ds);

3
drivers/net/dsa/microchip/ksz_common.h
View File

@ -80,8 +80,7 @@ struct ksz_device {
struct vlan_table *vlan_cache; struct vlan_table *vlan_cache;
struct ksz_port *ports; struct ksz_port *ports;
struct timer_list mib_read_timer; struct delayed_work mib_read;
struct work_struct mib_read;
unsigned long mib_read_interval; unsigned long mib_read_interval;
u16 br_member; u16 br_member;
u16 member; u16 member;