From: Rusty Russell <rusty@rustcorp.com.au>

Feedback from Jeff Garzik:
1) Use netdev_priv instead of dev->priv.
2) Check for ioremap failure
3) iounmap on failure.
4) Wrap SEND_DMA and BIND_DMA calls
5) Don't set NETIF_F_SG unless we set NETIF_F_NO_CSUM
6) Use SET_NETDEV_DEV()
7) Don't set dev->irq, mem_start & mem_end (deprecated)

Feedback from Chrisoph Hellwig:
8) Use lguest_map()/lguest_unmap() helpers instead of ioremap/iounmap.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/lguest_net.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN drivers/net/lguest_net.c~lguest-the-net-driver-tidyups-update drivers/net/lguest_net.c
--- a/drivers/net/lguest_net.c~lguest-the-net-driver-tidyups-update
+++ a/drivers/net/lguest_net.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/mm_types.h>
 #include <linux/lguest_bus.h>
-#include <asm/io.h>
 
 #define SHARED_SIZE		PAGE_SIZE
 #define MAX_LANS		4
@@ -301,7 +300,7 @@ static int lguestnet_probe(struct lguest
 	info->mapsize = PAGE_SIZE * desc->num_pages;
 	info->peer_phys = ((unsigned long)desc->pfn << PAGE_SHIFT);
 	info->lgdev = lgdev;
-	info->peer = (__force void *)ioremap(info->peer_phys, info->mapsize);
+	info->peer = lguest_map(info->peer_phys, desc->num_pages);
 	if (!info->peer) {
 		err = -ENOMEM;
 		goto free;
@@ -331,7 +330,7 @@ static int lguestnet_probe(struct lguest
 unregister:
 	unregister_netdev(dev);
 unmap:
-	iounmap((__force void __iomem *)info->peer);
+	lguest_unmap(info->peer);
 free:
 	free_netdev(dev);
 	return err;
_