[PATCH] sun3-related net driver fixes

On Mon, 17 Nov 2003, Geert Uytterhoeven wrote:
> On Sun, 16 Nov 2003, Jeff Garzik wrote:
> > Yet more updates.  Syncing with Andrew Morton, and more syncing with Al
> > Viro.
> >
> > No users of init_etherdev remain in the tree.  (yay!)
>
> Here are some (untested, except for cross-gcc) fixes for the m68k-related
> drivers:

I forget to test the Sun-3 drivers:
  - sun3_82586.c:
      o add missing casts to iounmap() calls
      o fix parameter of free_netdev()
  - sun3lance.c: add missing casts to iounmap() calls

Note that sun3_82586.c no longer compiles since SUN3_82586_TOTAL_SIZE is not
defined. Sammy, is it OK to use PAGE_SIZE for that, since that's what's passed
to ioremap()?

drivers/net/sun3_82586.c

@@ -327,7 +327,7 @@ struct net_device * __init sun3_82586_probe(int unit)
 out1:
 	free_netdev(dev);
 out:
-	iounmap(ioaddr);
+	iounmap((void *)ioaddr);
 	return ERR_PTR(err);
 }
 
@@ -1163,8 +1163,8 @@ void cleanup_module(void)
 	unsigned long ioaddr = dev_sun3_82586->base_addr;
 	unregister_netdev(dev_sun3_82586);
 	release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
-	iounmap(ioaddr);
-	free_netdev(dev);
+	iounmap((void *)ioaddr);
+	free_netdev(dev_sun3_82586);
 }
 #endif /* MODULE */
 

drivers/net/sun3lance.c

@@ -287,7 +287,7 @@ struct net_device * __init sun3lance_probe(int unit)
 
 out1:
 #ifdef CONFIG_SUN3
-	iounmap(dev->base_addr);
+	iounmap((void *)dev->base_addr);
 #endif
 out:
 	free_netdev(dev);
@@ -327,7 +327,7 @@ static int __init lance_probe( struct net_device *dev)
 		ioaddr_probe[1] = tmp2;
 
 #ifdef CONFIG_SUN3
-		iounmap(ioaddr);
+		iounmap((void *)ioaddr);
 #endif
 		return 0;
 	}
@@ -957,7 +957,7 @@ void cleanup_module(void)
 {
 	unregister_netdev(sun3lance_dev);
 #ifdef CONFIG_SUN3
-	iounmap(sun3lance_dev->base_addr);
+	iounmap((void *)sun3lance_dev->base_addr);
 #endif
 	free_netdev(sun3lance_dev);
 }