[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-arm-kernel
Subject:    pcmcia cleanup for 2.4.21-rmk1-pxa1
From:       Holger Schurig <h.schurig () mn-logistik ! de>
Date:       2003-11-28 12:57:43
[Download RAW message or body]

This patch kills some warnings

-- 
MN-Logistik GmbH         http://www.mn-logistik.de
Holger Schurig
Dieselstr. 18
61191 Rosbach v.d.Höhe
Tel: (+49) 6003 9141 0   Fax: (+49) 6003 9141 49

["pxa-pcmcia.patch" (text/x-diff)]

remove some warnings because of superfluous 'mecr' definitions

#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#

--- linux-2.4.21/drivers/pcmcia/pxa/pxa.c~pxa-pcmcia
+++ linux-2.4.21/drivers/pcmcia/pxa/pxa.c
@@ -187,7 +187,6 @@
   struct pcmcia_state state[PXA_PCMCIA_MAX_SOCK];
   struct pcmcia_state_array state_array;
   unsigned int i, clock;
-  unsigned long mecr;
 
   printk(KERN_INFO "Intel PXA250/210 PCMCIA (CS release %s)\n", CS_RELEASE);
 
@@ -835,7 +834,7 @@
 static int pxa_pcmcia_set_io_map(unsigned int sock,
 				    struct pccard_io_map *map){
   unsigned int clock, speed;
-  unsigned long mecr, start;
+  unsigned long start;
 
   DEBUG(4, "%s() for sock %u\n", __FUNCTION__, sock);
 
@@ -941,7 +940,7 @@
 static int pxa_pcmcia_set_mem_map(unsigned int sock,
 				     struct pccard_mem_map *map){
   unsigned int clock, speed;
-  unsigned long mecr, start;
+  unsigned long start;
 
   DEBUG(4, "%s() for sock %u\n", __FUNCTION__, sock);
 
@@ -1076,7 +1075,6 @@
   char *p=buf;
   unsigned int sock=(unsigned int)data;
   unsigned int clock = get_lclk_frequency_10khz();
-  unsigned long mecr = MECR;
 
   p+=sprintf(p, "k_flags  : %s%s%s%s%s%s%s\n", 
 	     pxa_pcmcia_socket[sock].k_state.detect?"detect ":"",


-------------------------------------------------------------------
Subscription options: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ/Etiquette:       http://www.arm.linux.org.uk/armlinux/mailinglists.php



[prev in list] [next in list] [prev in thread] [next in thread]