From c1cd5c98e9d22f203ab844afa3699163b560fd6e Mon Sep 17 00:00:00 2001
From: gmcgarry <gmcgarry@NetBSD.org>
Date: Tue, 24 Jun 2008 10:20:41 +0000
Subject: [PATCH] Ragge says that 6.5.4 clause 2 says:

"Unless the type name specifies a void type, the type name shall specify
qualified or unqualified scalar type and the operand shall have scalar
type."

Therefore, don't cast to a union.
---
 sys/dev/pci/twa.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c
index b1df81cd04d2..068d2ace406d 100644
--- a/sys/dev/pci/twa.c
+++ b/sys/dev/pci/twa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: twa.c,v 1.25 2008/06/08 14:02:25 joerg Exp $ */
+/*	$NetBSD: twa.c,v 1.26 2008/06/24 10:20:41 gmcgarry Exp $ */
 /*	$wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.25 2008/06/08 14:02:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.26 2008/06/24 10:20:41 gmcgarry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1021,7 +1021,7 @@ twa_request_bus_scan(struct twa_softc *sc)
 }
 
 
-#ifdef	DIAGNOSTIC
+#ifdef DIAGNOSTIC
 static inline void
 twa_check_busy_q(struct twa_request *tr)
 {
@@ -1129,9 +1129,9 @@ twa_drain_response_queue(struct twa_softc *sc)
 			return(1);
 		if (status_reg & TWA_STATUS_RESPONSE_QUEUE_EMPTY)
 			return(0); /* no more response queue entries */
-		rq = (union twa_response_queue)twa_inl(sc,
-		    TWA_RESPONSE_QUEUE_OFFSET);
+		rq.u.response_id = twa_inl(sc, TWA_RESPONSE_QUEUE_OFFSET);
 	}
+
 }
 
 /*
@@ -1147,7 +1147,6 @@ twa_drain_response_queue_large(struct twa_softc *sc, uint32_t timeout)
 {
         uint32_t        start_time = 0, end_time;
         uint32_t        response = 0;
-
         if (sc->sc_product_id == PCI_PRODUCT_3WARE_9550 ||
             sc->sc_product_id == PCI_PRODUCT_3WARE_9650 ) {
                start_time = 0;
@@ -1167,6 +1166,7 @@ twa_drain_response_queue_large(struct twa_softc *sc, uint32_t timeout)
        return (0);
 }
 
+
 static void
 twa_drain_busy_queue(struct twa_softc *sc)
 {
@@ -1301,7 +1301,7 @@ out:
 }
 
 
-#ifdef		DIAGNOSTIC
+#ifdef DIAGNOSTIC
 static void
 twa_check_response_q(struct twa_request *tr, int clear)
 {
@@ -1352,8 +1352,7 @@ twa_done(struct twa_softc *sc)
 		if (status_reg & TWA_STATUS_RESPONSE_QUEUE_EMPTY)
 			break;
 		/* Response queue is not empty. */
-		rq = (union twa_response_queue)twa_inl(sc,
-			TWA_RESPONSE_QUEUE_OFFSET);
+		rq.u.response_id = twa_inl(sc, TWA_RESPONSE_QUEUE_OFFSET);
 		tr = sc->sc_twa_request + rq.u.response_id;
 #ifdef		DIAGNOSTIC
 		twa_check_response_q(tr, 0);