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

staging: octeon-ethernet: drop poll_now parameter from cvm_oct_common_open 

Drop redundant poll_now parameter from cvm_oct_common_open.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2015-10-17 22:28:55 +03:00 committed by Greg Kroah-Hartman
parent 064e08350f
commit 2c265f7479
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/octeon/ethernet-rgmii.c
View File

@ -207,7 +207,7 @@ static irqreturn_t cvm_oct_rgmii_rml_interrupt(int cpl, void *dev_id)
int cvm_oct_rgmii_open(struct net_device *dev)
{
return cvm_oct_common_open(dev, cvm_oct_rgmii_poll, true);
return cvm_oct_common_open(dev, cvm_oct_rgmii_poll);
}
static void cvm_oct_rgmii_immediate_poll(struct work_struct *work)

2
drivers/staging/octeon/ethernet-sgmii.c
View File

@ -27,7 +27,7 @@
int cvm_oct_sgmii_open(struct net_device *dev)
{
return cvm_oct_common_open(dev, cvm_oct_link_poll, true);
return cvm_oct_common_open(dev, cvm_oct_link_poll);
}
int cvm_oct_sgmii_init(struct net_device *dev)

2
drivers/staging/octeon/ethernet-xaui.c
View File

@ -27,5 +27,5 @@
int cvm_oct_xaui_open(struct net_device *dev)
{
return cvm_oct_common_open(dev, cvm_oct_link_poll, true);
return cvm_oct_common_open(dev, cvm_oct_link_poll);
}

5
drivers/staging/octeon/ethernet.c
View File

@ -481,7 +481,7 @@ void cvm_oct_common_uninit(struct net_device *dev)
}
int cvm_oct_common_open(struct net_device *dev,
void (*link_poll)(struct net_device *), bool poll_now)
void (*link_poll)(struct net_device *))
{
union cvmx_gmxx_prtx_cfg gmx_cfg;
struct octeon_ethernet *priv = netdev_priv(dev);
@ -512,8 +512,7 @@ int cvm_oct_common_open(struct net_device *dev,
if (!link_info.s.link_up)
netif_carrier_off(dev);
priv->poll = link_poll;
if (poll_now)
link_poll(dev);
link_poll(dev);
}
return 0;

2
drivers/staging/octeon/octeon-ethernet.h
View File

@ -69,7 +69,7 @@ void cvm_oct_common_uninit(struct net_device *dev);
void cvm_oct_adjust_link(struct net_device *dev);
int cvm_oct_common_stop(struct net_device *dev);
int cvm_oct_common_open(struct net_device *dev,
void (*link_poll)(struct net_device *), bool poll_now);
void (*link_poll)(struct net_device *));
void cvm_oct_note_carrier(struct octeon_ethernet *priv,
cvmx_helper_link_info_t li);
void cvm_oct_link_poll(struct net_device *dev);