diff options
| author |   Iyappan Subramanian <isubramanian@apm.com> | 2014-10-13 17:05:33 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-10-14 16:09:21 -0400 |
| commit | dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf (patch) | |
| tree | 2c5b4cbff124612a69b1f8ce2b5793fea0a00495 /drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | |
| parent | dtb: Add SGMII based 1GbE node to APM X-Gene SoC device tree (diff) | |
| download | linux-dev-dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf.tar.xz linux-dev-dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf.zip | |
drivers: net: xgene: Preparing for adding SGMII based 1GbE
- Added link_state function pointer to the xgene__mac_ops structure
- Moved ring manager (pdata->rm) assignment to xgene_enet_setup_ops
- Removed unused variable (pdata->phy_addr) and macro (FULL_DUPLEX)
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c index cd64b9f18b58..67d07206b3c7 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c @@ -284,7 +284,7 @@ static void xgene_enet_shutdown(struct xgene_enet_pdata *pdata) clk_disable_unprepare(pdata->clk); } -void xgene_enet_link_state(struct work_struct *work) +static void xgene_enet_link_state(struct work_struct *work) { struct xgene_enet_pdata *pdata = container_of(to_delayed_work(work), struct xgene_enet_pdata, link_work); @@ -322,6 +322,7 @@ struct xgene_mac_ops xgene_xgmac_ops = { .rx_disable = xgene_xgmac_rx_disable, .tx_disable = xgene_xgmac_tx_disable, .set_mac_addr = xgene_xgmac_set_mac_addr, + .link_state = xgene_enet_link_state }; struct xgene_port_ops xgene_xgport_ops = { |