Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

3 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 3ec20cc18b0c..cc7708775da0 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -298,7 +298,7 @@ poll_some_more:
                 int more = 0;
 
                 spin_lock_irq(&ep->rx_lock);
-                __netif_rx_complete(napi);
+                __napi_complete(napi);
                 wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX);
                 if (ep93xx_have_more_rx(ep)) {
                         wrl(ep, REG_INTEN, REG_INTEN_TX);
@@ -307,7 +307,7 @@ poll_some_more:
                 }
                 spin_unlock_irq(&ep->rx_lock);
 
-                if (more && netif_rx_reschedule(napi))
+                if (more && napi_reschedule(napi))
                         goto poll_some_more;
         }
 
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id)
 
         if (status & REG_INTSTS_RX) {
                 spin_lock(&ep->rx_lock);
-                if (likely(netif_rx_schedule_prep(&ep->napi))) {
+                if (likely(napi_schedule_prep(&ep->napi))) {
                         wrl(ep, REG_INTEN, REG_INTEN_TX);
-                        __netif_rx_schedule(&ep->napi);
+                        __napi_schedule(&ep->napi);
                 }
                 spin_unlock(&ep->rx_lock);
         }
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 9cc43476bfa6..448487e22fa3 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -482,7 +482,7 @@ static void eth_rx_irq(void *pdev)
         printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name);
 #endif
         qmgr_disable_irq(port->plat->rxq);
-        netif_rx_schedule(&port->napi);
+        napi_schedule(&port->napi);
 }
 
 static int eth_poll(struct napi_struct *napi, int budget)
@@ -507,16 +507,16 @@ static int eth_poll(struct napi_struct *napi, int budget)
 
                 if ((n = queue_get_desc(rxq, port, 0)) < 0) {
 #if DEBUG_RX
-                        printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n",
+                        printk(KERN_DEBUG "%s: eth_poll napi_complete\n",
                                dev->name);
 #endif
-                        netif_rx_complete(napi);
+                        napi_complete(napi);
                         qmgr_enable_irq(rxq);
                         if (!qmgr_stat_empty(rxq) &&
-                            netif_rx_reschedule(napi)) {
+                            napi_reschedule(napi)) {
 #if DEBUG_RX
                                 printk(KERN_DEBUG "%s: eth_poll"
-                                       " netif_rx_reschedule successed\n",
+                                       " napi_reschedule successed\n",
                                        dev->name);
 #endif
                                 qmgr_disable_irq(rxq);
@@ -1045,7 +1045,7 @@ static int eth_open(struct net_device *dev)
         }
         ports_open++;
         /* we may already have RX data, enables IRQ */
-        netif_rx_schedule(&port->napi);
+        napi_schedule(&port->napi);
         return 0;
 }
 
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index f3a127434897..35cd264abae7 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1059,7 +1059,7 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)
 {
         strlcpy(info->driver, MODULENAME, sizeof(info->driver));
         strlcpy(info->version, MODULEVERSION, sizeof(info->version));
-        strlcpy(info->bus_info, ndev->dev.parent->bus_id,
+        strlcpy(info->bus_info, dev_name(ndev->dev.parent),
                 sizeof(info->bus_info));
 }