Received: with ECARTIS (v1.0.0; list netdev); Tue, 23 Sep 2003 10:12:06 -0700 (PDT) Received: from mail.osdl.org (fw.osdl.org [65.172.181.6]) by oss.sgi.com (8.12.10/8.12.10) with SMTP id h8NHBuFx025339 for ; Tue, 23 Sep 2003 10:11:57 -0700 Received: from dell_ss3.pdx.osdl.net (dell_ss3.pdx.osdl.net [172.20.1.60]) by mail.osdl.org (8.11.6/8.11.6) with SMTP id h8NHBe112783; Tue, 23 Sep 2003 10:11:40 -0700 Date: Tue, 23 Sep 2003 10:11:16 -0700 From: Stephen Hemminger To: "David S. Miller" Cc: netdev@oss.sgi.com Subject: [PATCH] (1/3) Space.c -- alloc_divert_blk not needed here. Message-Id: <20030923101116.5c5bea3b.shemminger@osdl.org> Organization: Open Source Development Lab X-Mailer: Sylpheed version 0.9.4claws (GTK+ 1.2.10; i686-pc-linux-gnu) X-Face: &@E+xe?c%:&e4D{>f1O<&U>2qwRREG5!}7R4;D<"NO^UI2mJ[eEOA2*3>(`Th.yP,VDPo9$ /`~cw![cmj~~jWe?AHY7D1S+\}5brN0k*NE?pPh_'_d>6;XGG[\KDRViCfumZT3@[ Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-archive-position: 170 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: shemminger@osdl.org Precedence: bulk X-list: netdev Content-Length: 981 Lines: 33 No longer need to alloc_divert_blk in probe process because the network probe code now calls register_netdevice which does it if necessary. diff -Nru a/drivers/net/Space.c b/drivers/net/Space.c --- a/drivers/net/Space.c Tue Sep 23 09:36:52 2003 +++ b/drivers/net/Space.c Tue Sep 23 09:36:52 2003 @@ -125,22 +125,14 @@ { struct devprobe *p = plist; unsigned long base_addr = dev->base_addr; - int ret; while (p->probe != NULL) { - if (base_addr && p->probe(dev) == 0) { /* probe given addr */ - ret = alloc_divert_blk(dev); - if (ret) - return ret; + if (base_addr && p->probe(dev) == 0) /* probe given addr */ return 0; - } else if (p->status == 0) { /* has autoprobe failed yet? */ + else if (p->status == 0) { /* has autoprobe failed yet? */ p->status = p->probe(dev); /* no, try autoprobe */ - if (p->status == 0) { - ret = alloc_divert_blk(dev); - if (ret) - return ret; + if (p->status == 0) return 0; - } } p++; }