Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 08:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dsa: remove DSA link polling

Browse Source 
Since no more DSA driver uses the polling callback, and since
the phylib handles the link detection, remove the link polling
work and timer code.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Neil Armstrong 2015-12-07 13:57:32 +01:00 committed by David S. Miller
parent ad9360b3e5
commit 4baee937b8
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/dsa.h
View File

@ -116,13 +116,6 @@ struct dsa_switch_tree {
s8 cpu_switch; s8 cpu_switch;
s8 cpu_port; s8 cpu_port;
/*
* Link state polling.
*/
int link_poll_needed;
struct work_struct link_poll_work;
struct timer_list link_poll_timer;
/* /*
* Data for the individual switch chips. * Data for the individual switch chips.
*/ */
@ -231,11 +224,6 @@ struct dsa_switch_driver {
int (*phy_write)(struct dsa_switch *ds, int port, int (*phy_write)(struct dsa_switch *ds, int port,
int regnum, u16 val); int regnum, u16 val);
/*
* Link state polling and IRQ handling.
*/
void (*poll_link)(struct dsa_switch *ds);
/* /*
* Link state adjustment (called from libphy) * Link state adjustment (called from libphy)
*/ */

43
net/dsa/dsa.c
View File

@ -508,33 +508,6 @@ static int dsa_switch_resume(struct dsa_switch *ds)
} }
#endif #endif
/* link polling *************************************************************/
static void dsa_link_poll_work(struct work_struct *ugly)
{
struct dsa_switch_tree *dst;
int i;
dst = container_of(ugly, struct dsa_switch_tree, link_poll_work);
for (i = 0; i < dst->pd->nr_chips; i++) {
struct dsa_switch *ds = dst->ds[i];
if (ds != NULL && ds->drv->poll_link != NULL)
ds->drv->poll_link(ds);
}
mod_timer(&dst->link_poll_timer, round_jiffies(jiffies + HZ));
}
static void dsa_link_poll_timer(unsigned long _dst)
{
struct dsa_switch_tree *dst = (void *)_dst;
schedule_work(&dst->link_poll_work);
}
/* platform driver init and cleanup *****************************************/ /* platform driver init and cleanup *****************************************/
static int dev_is_class(struct device *dev, void *class) static int dev_is_class(struct device *dev, void *class)
{ {
@ -877,8 +850,6 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
} }
dst->ds[i] = ds; dst->ds[i] = ds;
if (ds->drv->poll_link != NULL)
dst->link_poll_needed = 1;
++configured; ++configured;
} }
@ -897,15 +868,6 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
wmb(); wmb();
dev->dsa_ptr = (void *)dst; dev->dsa_ptr = (void *)dst;
if (dst->link_poll_needed) {
INIT_WORK(&dst->link_poll_work, dsa_link_poll_work);
init_timer(&dst->link_poll_timer);
dst->link_poll_timer.data = (unsigned long)dst;
dst->link_poll_timer.function = dsa_link_poll_timer;
dst->link_poll_timer.expires = round_jiffies(jiffies + HZ);
add_timer(&dst->link_poll_timer);
}
return 0; return 0;
} }
@ -972,11 +934,6 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
{ {
int i; int i;
if (dst->link_poll_needed)
del_timer_sync(&dst->link_poll_timer);
flush_work(&dst->link_poll_work);
for (i = 0; i < dst->pd->nr_chips; i++) { for (i = 0; i < dst->pd->nr_chips; i++) {
struct dsa_switch *ds = dst->ds[i]; struct dsa_switch *ds = dst->ds[i];