linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Jeff Garzik <jgarzik@pobox.com>, Sam Creasey <sammy@sammy.net>
Cc: netdev@oss.sgi.com, Linux Kernel <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@osdl.org>,
	Al Viro <viro@parcelfarce.linux.theplanet.co.uk>,
	Linux/m68k <linux-m68k@lists.linux-m68k.org>
Subject: Re: [BK PATCHES] 2.6.x experimental net driver queue
Date: Tue, 18 Nov 2003 13:27:52 +0100 (MET)	[thread overview]
Message-ID: <Pine.GSO.4.21.0311181205460.6448-100000@waterleaf.sonytel.be> (raw)
In-Reply-To: <Pine.GSO.4.21.0311171812000.5421-100000@waterleaf.sonytel.be>

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()?

--- linux-net2-2.6.0-test9/drivers/net/sun3_82586.c	2003-11-17 11:06:18.000000000 +0100
+++ linux-net2-2.6.0-test9/drivers/net/sun3_82586.c	2003-11-18 13:03:01.000000000 +0100
@@ -327,7 +327,7 @@
 out1:
 	free_netdev(dev);
 out:
-	iounmap(ioaddr);
+	iounmap((void *)ioaddr);
 	return ERR_PTR(err);
 }
 
@@ -1163,8 +1163,8 @@
 	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 */
 
--- linux-net2-2.6.0-test9/drivers/net/sun3lance.c	2003-11-17 11:06:18.000000000 +0100
+++ linux-net2-2.6.0-test9/drivers/net/sun3lance.c	2003-11-18 13:02:32.000000000 +0100
@@ -287,7 +287,7 @@
 
 out1:
 #ifdef CONFIG_SUN3
-	iounmap(dev->base_addr);
+	iounmap((void *)dev->base_addr);
 #endif
 out:
 	free_netdev(dev);
@@ -327,7 +327,7 @@
 		ioaddr_probe[1] = tmp2;
 
 #ifdef CONFIG_SUN3
-		iounmap(ioaddr);
+		iounmap((void *)ioaddr);
 #endif
 		return 0;
 	}
@@ -957,7 +957,7 @@
 {
 	unregister_netdev(sun3lance_dev);
 #ifdef CONFIG_SUN3
-	iounmap(sun3lance_dev->base_addr);
+	iounmap((void *)sun3lance_dev->base_addr);
 #endif
 	free_netdev(sun3lance_dev);
 }

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


  reply	other threads:[~2003-11-18 12:28 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-17  0:36 [BK PATCHES] 2.6.x experimental net driver queue Jeff Garzik
2003-11-17 17:58 ` Geert Uytterhoeven
2003-11-18 12:27   ` Geert Uytterhoeven [this message]
2003-11-18 21:42     ` Jeff Garzik
2003-11-19 22:08     ` Sam Creasey
2003-11-19  9:37       ` Geert Uytterhoeven
  -- strict thread matches above, loose matches on Subject: below --
2003-12-07 20:36 Jeff Garzik
2003-12-05 19:28 Jeff Garzik
2003-11-22 18:30 Jeff Garzik
2003-11-16 18:16 Jeff Garzik
2003-10-29 23:34 Jeff Garzik
2003-10-29 21:23 Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.GSO.4.21.0311181205460.6448-100000@waterleaf.sonytel.be \
    --to=geert@linux-m68k.org \
    --cc=akpm@osdl.org \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=netdev@oss.sgi.com \
    --cc=sammy@sammy.net \
    --cc=viro@parcelfarce.linux.theplanet.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).