[Linux-mips-commits]CVS: linux/drivers/pcmcia au1000_generic.c,1.1,1.2

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv27627/drivers/pcmcia

Modified Files:
	au1000_generic.c 
Log Message:
Reindented some code since it was incorrectly split up by
'indent'.


Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** au1000_generic.c	2001/09/05 18:30:03	1.1
--- au1000_generic.c	2001/09/05 19:51:47	1.2
***************
*** 682,694 ****
  
  	p += sprintf(p, "status   : %s%s%s%s%s%s%s%s%s\n",
! 		     pcmcia_socket[sock].
! 		     k_state.detect ? "SS_DETECT " : "",
  		     pcmcia_socket[sock].k_state.ready ? "SS_READY " : "",
  		     pcmcia_socket[sock].cs_state.Vcc ? "SS_POWERON " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_IOCARD ? \"SS_IOCARD " : "",
  		     (pcmcia_socket[sock].cs_state.flags & SS_IOCARD
! 		      && pcmcia_socket[sock].
! 		      k_state.bvd1) ? "SS_STSCHG " : "",
  		     ((pcmcia_socket[sock].cs_state.flags & SS_IOCARD) == 0
  		      && (pcmcia_socket[sock].k_state.bvd1 ==
--- 682,692 ----
  
  	p += sprintf(p, "status   : %s%s%s%s%s%s%s%s%s\n",
! 		     pcmcia_socket[sock].k_state.detect ? "SS_DETECT " : "",
  		     pcmcia_socket[sock].k_state.ready ? "SS_READY " : "",
  		     pcmcia_socket[sock].cs_state.Vcc ? "SS_POWERON " : "",
! 		     pcmcia_socket[sock].cs_state.flags & SS_IOCARD ? 
! 		     "SS_IOCARD " : "",
  		     (pcmcia_socket[sock].cs_state.flags & SS_IOCARD
! 		      && pcmcia_socket[sock].k_state.bvd1) ? "SS_STSCHG " : "",
  		     ((pcmcia_socket[sock].cs_state.flags & SS_IOCARD) == 0
  		      && (pcmcia_socket[sock].k_state.bvd1 ==
***************
*** 698,740 ****
  			  0)) ? "SS_BATWARN " : "",
  		     pcmcia_socket[sock].k_state.vs_3v ? "SS_3VCARD " : "",
! 		     pcmcia_socket[sock].
! 		     k_state.vs_Xv ? "SS_XVCARD " : "");
  
  	p += sprintf(p, "mask     : %s%s%s%s%s\n",
! 		     pcmcia_socket[sock].
! 		     cs_state.csc_mask & SS_DETECT ? \"SS_DETECT " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.csc_mask & SS_READY ? \"SS_READY " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.csc_mask & SS_BATDEAD ? \"SS_BATDEAD " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.csc_mask & SS_BATWARN ? \"SS_BATWARN " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.csc_mask & SS_STSCHG ? \"SS_STSCHG " : "");
  
  	p += sprintf(p, "cs_flags : %s%s%s%s%s\n",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_PWR_AUTO ? \"SS_PWR_AUTO " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_IOCARD ? \"SS_IOCARD " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_RESET ? \"SS_RESET " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_SPKR_ENA ? \"SS_SPKR_ENA " : "",
! 		     pcmcia_socket[sock].
! 		     cs_state.flags & SS_OUTPUT_ENA ? \"SS_OUTPUT_ENA " :
  		     "");
  
! 	p +=
! 	    sprintf(p, "Vcc      : %d\n",
! 		    pcmcia_socket[sock].cs_state.Vcc);
  
! 	p +=
! 	    sprintf(p, "Vpp      : %d\n",
! 		    pcmcia_socket[sock].cs_state.Vpp);
  
! 	p +=
! 	    sprintf(p, "irq      : %d\n",
! 		    pcmcia_socket[sock].cs_state.io_irq);
  
  	p += sprintf(p, "I/O      : %u\n", pcmcia_socket[sock].speed_io);
--- 696,734 ----
  			  0)) ? "SS_BATWARN " : "",
  		     pcmcia_socket[sock].k_state.vs_3v ? "SS_3VCARD " : "",
! 		     pcmcia_socket[sock].k_state.vs_Xv ? "SS_XVCARD " : "");
  
  	p += sprintf(p, "mask     : %s%s%s%s%s\n",
! 		     pcmcia_socket[sock].cs_state.csc_mask & SS_DETECT ? \
! 		     "SS_DETECT " : "",
! 		     pcmcia_socket[sock].cs_state.csc_mask & SS_READY ? \
! 		     "SS_READY " : "",
! 		     pcmcia_socket[sock].cs_state.csc_mask & SS_BATDEAD ? \
! 		     "SS_BATDEAD " : "",
! 		     pcmcia_socket[sock].cs_state.csc_mask & SS_BATWARN ? \
! 		     "SS_BATWARN " : "",
! 		     pcmcia_socket[sock].cs_state.csc_mask & SS_STSCHG ? \
! 		     "SS_STSCHG " : "");
  
  	p += sprintf(p, "cs_flags : %s%s%s%s%s\n",
! 		     pcmcia_socket[sock].cs_state.flags & SS_PWR_AUTO ? \
! 		     "SS_PWR_AUTO " : "",
! 		     pcmcia_socket[sock].cs_state.flags & SS_IOCARD ? \
! 		     "SS_IOCARD " : "",
! 		     pcmcia_socket[sock].cs_state.flags & SS_RESET ? \
! 		     "SS_RESET " : "",
! 		     pcmcia_socket[sock].cs_state.flags & SS_SPKR_ENA ? \
! 		     "SS_SPKR_ENA " : "",
! 		     pcmcia_socket[sock].cs_state.flags & SS_OUTPUT_ENA ? \
! 		     "SS_OUTPUT_ENA " :
  		     "");
  
! 	p += sprintf(p, "Vcc      : %d\n", 
! 			pcmcia_socket[sock].cs_state.Vcc);
  
! 	p += sprintf(p, "Vpp      : %d\n", 
! 			pcmcia_socket[sock].cs_state.Vpp);
  
! 	p += sprintf(p, "irq      : %d\n", 
! 			pcmcia_socket[sock].cs_state.io_irq);
  
  	p += sprintf(p, "I/O      : %u\n", pcmcia_socket[sock].speed_io);