[Linux-mips-commits] CVS: linux/drivers/sound nec_vrc5477.c,1.1.1.1,1.2

[James S. <jsi...@us...>]

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

Modified Files:
	nec_vrc5477.c 
Log Message:
Change delay loop into udelay() call.  Fix warning.

Index: nec_vrc5477.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/nec_vrc5477.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nec_vrc5477.c	2001/06/22 02:29:32	1.1.1.1
--- nec_vrc5477.c	2001/08/20 16:34:26	1.2
***************
*** 87,91 ****
  
  #undef VRC5477_AC97_VERBOSE_DEBUG
- // #define VRC5477_AC97_VERBOSE_DEBUG	1
  
  /* one must turn on CONFIG_LL_DEBUG before VERBOSE_DEBUG is turned */
--- 87,90 ----
***************
*** 261,265 ****
  	unsigned long flags;
  	u32 result;
- 	int i;
  
  	spin_lock_irqsave(&s->lock, flags);
--- 260,263 ----
***************
*** 273,277 ****
  
  	/* get the return result */
! 	for (i=10000; i; i--);		/* workaround hardware bug */
  	while ( (result = inl(s->io + VRC5477_CODEC_RD)) & 
                  (VRC5477_CODEC_RD_RRDYA | VRC5477_CODEC_RD_RRDYD) ) {
--- 271,275 ----
  
  	/* get the return result */
! 	udelay(100); /* workaround hardware bug */
  	while ( (result = inl(s->io + VRC5477_CODEC_RD)) & 
                  (VRC5477_CODEC_RD_RRDYA | VRC5477_CODEC_RD_RRDYD) ) {
***************
*** 1094,1098 ****
--- 1092,1098 ----
          int totalCopyFragCount = 0;
          unsigned long flags;
+ #if defined(VRC5477_AC97_VERBOSE_DEBUG)
  	int i;
+ #endif
  
          /* adjust count to signel channel byte count */
***************
*** 1789,1793 ****
  {
          u32 result;
-         u32 i;
  
          /* wait until we can access codec registers */
--- 1789,1792 ----
***************
*** 1799,1803 ****
  
          /* get the return result */
!         for (i=10000; i; i--);
          // dump_memory(0xbb000000, 48);
          while ( ((result=myinl(VRC5477_CODEC_RD)) & 0xc0000000) != 0xc0000000);
--- 1798,1802 ----
  
          /* get the return result */
!         udelay(100); /* workaround hardware bug */
          // dump_memory(0xbb000000, 48);
          while ( ((result=myinl(VRC5477_CODEC_RD)) & 0xc0000000) != 0xc0000000);