From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 21 Jun 2006 16:07:01 +0000 (+0000)
Subject: Fix gcc-4.1 warnings (uninitialized variable).  The variable is question
X-Git-Tag: r0_7_71~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79ea955ed2776fd61de224fda15b03d3a80e263c;p=comedi.git

Fix gcc-4.1 warnings (uninitialized variable).  The variable is question
has been removed, as it is only used on an unreachable path.  Also, don't
bother calling pcmcia_release_window() as there is no matching call to
pcmcia_request_window().
---

diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index 6b8a1228..29e0f675 100644
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -804,7 +804,6 @@ static void das16cs_pcmcia_config(dev_link_t *link)
 	int last_fn, last_ret;
 	u_char buf[64];
 	config_info_t conf;
-	win_req_t req;
 	cistpl_cftable_entry_t dflt = { 0 };
 
 	DEBUG(0, "das16cs_pcmcia_config(0x%p)\n", link);
@@ -957,9 +956,6 @@ static void das16cs_pcmcia_config(dev_link_t *link)
 	if (link->io.NumPorts2)
 	printk(" & 0x%04x-0x%04x", link->io.BasePort2,
 			link->io.BasePort2+link->io.NumPorts2-1);
-	if (link->win)
-	printk(", mem 0x%06lx-0x%06lx", req.Base,
-			req.Base+req.Size-1);
 	printk("\n");
 
 	link->state &= ~DEV_CONFIG_PENDING;
@@ -994,8 +990,6 @@ static void das16cs_pcmcia_release(u_long arg)
     */
 
     /* Don't bother checking to see if these succeed or not */
-	if (link->win)
-		pcmcia_release_window(link->win);
 	pcmcia_release_configuration(link->handle);
 	if (link->io.NumPorts1)
 		pcmcia_release_io(link->handle, &link->io);
diff --git a/comedi/drivers/das08_cs.c b/comedi/drivers/das08_cs.c
index e9d05911..8f7d2f32 100644
--- a/comedi/drivers/das08_cs.c
+++ b/comedi/drivers/das08_cs.c
@@ -313,7 +313,6 @@ static void das08_pcmcia_config(dev_link_t *link)
 	int last_fn, last_ret;
 	u_char buf[64];
 	config_info_t conf;
-	win_req_t req;
 	cistpl_cftable_entry_t dflt = { 0 };
 
 	DEBUG(0, "das08_pcmcia_config(0x%p)\n", link);
@@ -467,9 +466,6 @@ static void das08_pcmcia_config(dev_link_t *link)
 	if (link->io.NumPorts2)
 	printk(" & 0x%04x-0x%04x", link->io.BasePort2,
 			link->io.BasePort2+link->io.NumPorts2-1);
-	if (link->win)
-	printk(", mem 0x%06lx-0x%06lx", req.Base,
-			req.Base+req.Size-1);
 	printk("\n");
 
 	link->state &= ~DEV_CONFIG_PENDING;
@@ -504,8 +500,6 @@ static void das08_pcmcia_release(u_long arg)
     */
 
     /* Don't bother checking to see if these succeed or not */
-	if (link->win)
-		pcmcia_release_window(link->win);
 	pcmcia_release_configuration(link->handle);
 	if (link->io.NumPorts1)
 		pcmcia_release_io(link->handle, &link->io);