usb: dwc3: dwc3-qcom: Fix typo in the dwc3 vbus override API

[linux-2.6-microblaze.git] / drivers / net / caif / caif_hsi.c

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 4a33ec4..3d63b15 100644 (file)
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -458,15 +458,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                skb_reset_mac_header(skb);
                skb->dev = cfhsi->ndev;
 
-               /*
-                * We are in a callback handler and
-                * unfortunately we don't know what context we're
-                * running in.
-                */
-               if (in_interrupt())
-                       netif_rx(skb);
-               else
-                       netif_rx_ni(skb);
+               netif_rx_any_context(skb);
 
                /* Update network statistics. */
                cfhsi->ndev->stats.rx_packets++;
@@ -587,14 +579,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                skb_reset_mac_header(skb);
                skb->dev = cfhsi->ndev;
 
-               /*
-                * We're called in callback from HSI
-                * and don't know the context we're running in.
-                */
-               if (in_interrupt())
-                       netif_rx(skb);
-               else
-                       netif_rx_ni(skb);
+               netif_rx_any_context(skb);
 
                /* Update network statistics. */
                cfhsi->ndev->stats.rx_packets++;