[SCSI] qla1280: don't use bitfields for hardware access in isp_config

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thiemo Seufer <ths@linux-mips.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 12 insertions, 18 deletions

diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index 18c20cf371af..4032ea3f2b94 100644
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -375,29 +375,23 @@ struct nvram {
         uint16_t unused_12;     /* 12, 13 */
         uint16_t unused_14;     /* 14, 15 */
 
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t reserved:2;
-                        uint8_t burst_enable:1;
-                        uint8_t reserved_1:1;
-                        uint8_t fifo_threshold:4;
-                } f;
+        struct {
+                uint8_t reserved:2;
+                uint8_t burst_enable:1;
+                uint8_t reserved_1:1;
+                uint8_t fifo_threshold:4;
         } isp_config;           /* 16 */
 
         /* Termination
          * 0 = Disable, 1 = high only, 3 = Auto term
          */
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t scsi_bus_1_control:2;
-                        uint8_t scsi_bus_0_control:2;
-                        uint8_t unused_0:1;
-                        uint8_t unused_1:1;
-                        uint8_t unused_2:1;
-                        uint8_t auto_term_support:1;
-                } f;
+        struct {
+                uint8_t scsi_bus_1_control:2;
+                uint8_t scsi_bus_0_control:2;
+                uint8_t unused_0:1;
+                uint8_t unused_1:1;
+                uint8_t unused_2:1;
+                uint8_t auto_term_support:1;
         } termination;          /* 17 */
 
         uint16_t isp_parameter; /* 18, 19 */