From b9add4c3a30c78854867062eb2d5e768ebcc9895 Mon Sep 17 00:00:00 2001 From: Ganesan Ramalingam Date: Thu, 21 Aug 2014 19:51:22 +0530 Subject: [PATCH] Staging: Netlogic: Add nlm_cop2_enable/restore function name change The function name nlm_cop2_enable() and nlm_cop2_restore() in file "netlogic/xlr/fmn.c" has been renamed to nlm_cop2_enable_irqsave and nlm_cop2_disable_irqrestore respectively in commit "64f6ebe MIPS: Netlogic: rename nlm_cop2_save/restore". This patch takes care of these changes Signed-off-by: Ganesan Ramalingam Signed-off-by: Greg Kroah-Hartman --- drivers/staging/netlogic/xlr_net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c index 9bf407d6241a..469f75f0f818 100644 --- a/drivers/staging/netlogic/xlr_net.c +++ b/drivers/staging/netlogic/xlr_net.c @@ -125,9 +125,9 @@ static int send_to_rfr_fifo(struct xlr_net_priv *priv, void *addr) msg.msg3 = 0; stnid = priv->nd->rfr_station; do { - mflags = nlm_cop2_enable(); + mflags = nlm_cop2_enable_irqsave(); ret = nlm_fmn_send(1, 0, stnid, &msg); - nlm_cop2_restore(mflags); + nlm_cop2_disable_irqrestore(mflags); if (ret == 0) return 0; } while (++num_try < 10000); @@ -298,9 +298,9 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb, u32 flags; xlr_make_tx_desc(&msg, virt_to_phys(skb->data), skb); - flags = nlm_cop2_enable(); + flags = nlm_cop2_enable_irqsave(); ret = nlm_fmn_send(2, 0, priv->nd->tx_stnid, &msg); - nlm_cop2_restore(flags); + nlm_cop2_disable_irqrestore(flags); if (ret) dev_kfree_skb_any(skb); return NETDEV_TX_OK; -- 2.20.1