From 0f69cefbd70a27f7e9bf71e24c9f712ffde4b882 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 24 Mar 2006 03:18:23 -0800
Subject: [PATCH] --- yaml --- r: 23455 b: refs/heads/master c:
 10e705f83c3e796893a70fb872895ba604901166 h: refs/heads/master i:   23453:
 3e26c6a8c25f8fec172b365e491637cdae9ac250   23451:
 573cefd938be92fd7f9adb912660e384ea500da5   23447:
 0e4f01e69a5003a0de4994e4c66e6582e9ddf0fa   23439:
 8a402b8c4ea75131cd603ce94e3fa372ba7ab4a2   23423:
 ffd490388c252eea9ab8551576bd2c5509618a13 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/block/paride/comm.c | 16 ++++++++--------
 trunk/drivers/block/paride/on26.c |  2 +-
 trunk/drivers/net/8139too.c       |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 5a350b3526a5..75157ce7ca34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac515898f35eaf7b77529cb0560115345d73bc15
+refs/heads/master: 10e705f83c3e796893a70fb872895ba604901166
diff --git a/trunk/drivers/block/paride/comm.c b/trunk/drivers/block/paride/comm.c
index d842956edf76..43d61359d8ec 100644
--- a/trunk/drivers/block/paride/comm.c
+++ b/trunk/drivers/block/paride/comm.c
@@ -60,7 +60,7 @@ static int comm_read_regr( PIA *pi, int cont, int regr )
 
 	case 2:
 	case 3:
-        case 4: w3(r+0x20); r1(); 
+        case 4: w3(r+0x20); (void)r1();
         	w2(0x24); h = r4(); w2(4);
                 return h;
 
@@ -82,7 +82,7 @@ static void comm_write_regr( PIA *pi, int cont, int regr, int val )
 
 	case 2:
 	case 3:
-        case 4: w3(r); r1(); w4(val); 
+        case 4: w3(r); (void)r1(); w4(val);
                 break;
         }
 }
@@ -126,17 +126,17 @@ static void comm_read_block( PIA *pi, char * buf, int count )
 		w2(4);
 		break;
 		
-	case 2: w3(0x68); r1(); w2(0x24);
+	case 2: w3(0x68); (void)r1(); w2(0x24);
 		for (i=0;i<count;i++) buf[i] = r4();
 		w2(4);
 		break;
 
-        case 3: w3(0x68); r1(); w2(0x24);
+        case 3: w3(0x68); (void)r1(); w2(0x24);
                 for (i=0;i<count/2;i++) ((u16 *)buf)[i] = r4w();
                 w2(4);
                 break;
 
-        case 4: w3(0x68); r1(); w2(0x24);
+        case 4: w3(0x68); (void)r1(); w2(0x24);
                 for (i=0;i<count/4;i++) ((u32 *)buf)[i] = r4l();
                 w2(4);
                 break;
@@ -160,15 +160,15 @@ static void comm_write_block( PIA *pi, char * buf, int count )
                 w2(5); w2(4);
                 break;
 
-        case 2: w3(0x48); r1();
+        case 2: w3(0x48); (void)r1();
                 for (k=0;k<count;k++) w4(buf[k^1]);
                 break;
 
-        case 3: w3(0x48); r1();
+        case 3: w3(0x48); (void)r1();
                 for (k=0;k<count/2;k++) w4w(pi_swab16(buf,k));
                 break;
 
-        case 4: w3(0x48); r1();
+        case 4: w3(0x48); (void)r1();
                 for (k=0;k<count/4;k++) w4l(pi_swab32(buf,k));
                 break;
 
diff --git a/trunk/drivers/block/paride/on26.c b/trunk/drivers/block/paride/on26.c
index 9f837d9a3639..0f833caa2101 100644
--- a/trunk/drivers/block/paride/on26.c
+++ b/trunk/drivers/block/paride/on26.c
@@ -66,7 +66,7 @@ static int on26_read_regr( PIA *pi, int cont, int regr )
 	case 3:
         case 4: w3(1); w3(1); w2(5); w4(r); w2(4);
 		w3(0); w3(0); w2(0x24); a = r4(); w2(4);
-		w2(0x24); r4(); w2(4);
+		w2(0x24); (void)r4(); w2(4);
                 return a;
 
         }
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
index f5ee064ab6b2..feae7832fc84 100644
--- a/trunk/drivers/net/8139too.c
+++ b/trunk/drivers/net/8139too.c
@@ -1131,7 +1131,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
    No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
  */
 
-#define eeprom_delay()	RTL_R32(Cfg9346)
+#define eeprom_delay()	(void)RTL_R32(Cfg9346)
 
 /* The EEPROM commands include the alway-set leading bit. */
 #define EE_WRITE_CMD	(5)