1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
index 487aa6f97412..14e197497b46 100644
--- a/drivers/scsi/mvsas/mv_94xx.h
+++ b/drivers/scsi/mvsas/mv_94xx.h
@@ -150,35 +150,35 @@ enum chip_register_bits {
 enum pci_interrupt_cause {
        /*  MAIN_IRQ_CAUSE (R10200) Bits*/
-        IRQ_COM_IN_I2O_IOP0            = (1 << 0),
+        MVS_IRQ_COM_IN_I2O_IOP0        = (1 << 0),
-        IRQ_COM_IN_I2O_IOP1            = (1 << 1),
+        MVS_IRQ_COM_IN_I2O_IOP1        = (1 << 1),
-        IRQ_COM_IN_I2O_IOP2            = (1 << 2),
+        MVS_IRQ_COM_IN_I2O_IOP2        = (1 << 2),
-        IRQ_COM_IN_I2O_IOP3            = (1 << 3),
+        MVS_IRQ_COM_IN_I2O_IOP3        = (1 << 3),
-        IRQ_COM_OUT_I2O_HOS0           = (1 << 4),
+        MVS_IRQ_COM_OUT_I2O_HOS0       = (1 << 4),
-        IRQ_COM_OUT_I2O_HOS1           = (1 << 5),
+        MVS_IRQ_COM_OUT_I2O_HOS1       = (1 << 5),
-        IRQ_COM_OUT_I2O_HOS2           = (1 << 6),
+        MVS_IRQ_COM_OUT_I2O_HOS2       = (1 << 6),
-        IRQ_COM_OUT_I2O_HOS3           = (1 << 7),
+        MVS_IRQ_COM_OUT_I2O_HOS3       = (1 << 7),
-        IRQ_PCIF_TO_CPU_DRBL0          = (1 << 8),
+        MVS_IRQ_PCIF_TO_CPU_DRBL0      = (1 << 8),
-        IRQ_PCIF_TO_CPU_DRBL1          = (1 << 9),
+        MVS_IRQ_PCIF_TO_CPU_DRBL1      = (1 << 9),
-        IRQ_PCIF_TO_CPU_DRBL2          = (1 << 10),
+        MVS_IRQ_PCIF_TO_CPU_DRBL2      = (1 << 10),
-        IRQ_PCIF_TO_CPU_DRBL3          = (1 << 11),
+        MVS_IRQ_PCIF_TO_CPU_DRBL3      = (1 << 11),
-        IRQ_PCIF_DRBL0                 = (1 << 12),
+        MVS_IRQ_PCIF_DRBL0             = (1 << 12),
-        IRQ_PCIF_DRBL1                 = (1 << 13),
+        MVS_IRQ_PCIF_DRBL1             = (1 << 13),
-        IRQ_PCIF_DRBL2                 = (1 << 14),
+        MVS_IRQ_PCIF_DRBL2             = (1 << 14),
-        IRQ_PCIF_DRBL3                 = (1 << 15),
+        MVS_IRQ_PCIF_DRBL3             = (1 << 15),
-        IRQ_XOR_A                      = (1 << 16),
+        MVS_IRQ_XOR_A                  = (1 << 16),
-        IRQ_XOR_B                      = (1 << 17),
+        MVS_IRQ_XOR_B                  = (1 << 17),
-        IRQ_SAS_A                      = (1 << 18),
+        MVS_IRQ_SAS_A                  = (1 << 18),
-        IRQ_SAS_B                      = (1 << 19),
+        MVS_IRQ_SAS_B                  = (1 << 19),
-        IRQ_CPU_CNTRL                  = (1 << 20),
+        MVS_IRQ_CPU_CNTRL              = (1 << 20),
-        IRQ_GPIO                       = (1 << 21),
+        MVS_IRQ_GPIO                   = (1 << 21),
-        IRQ_UART                       = (1 << 22),
+        MVS_IRQ_UART                   = (1 << 22),
-        IRQ_SPI                        = (1 << 23),
+        MVS_IRQ_SPI                    = (1 << 23),
-        IRQ_I2C                        = (1 << 24),
+        MVS_IRQ_I2C                    = (1 << 24),
-        IRQ_SGPIO                      = (1 << 25),
+        MVS_IRQ_SGPIO                  = (1 << 25),
-        IRQ_COM_ERR                    = (1 << 29),
+        MVS_IRQ_COM_ERR                = (1 << 29),
-        IRQ_I2O_ERR                    = (1 << 30),
+        MVS_IRQ_I2O_ERR                = (1 << 30),
-        IRQ_PCIE_ERR                   = (1 << 31),
+        MVS_IRQ_PCIE_ERR               = (1 << 31),
 };
 union reg_phy_cfg {

diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h index 487aa6f97412..14e197497b46 100644 --- a/drivers/scsi/mvsas/mv_94xx.h +++ b/drivers/scsi/mvsas/mv_94xx.h
@@ -150,35 +150,35 @@ enum chip_register_bits {
150		150
151	enum pci_interrupt_cause {	151	enum pci_interrupt_cause {
152	/* MAIN_IRQ_CAUSE (R10200) Bits*/	152	/* MAIN_IRQ_CAUSE (R10200) Bits*/
153	IRQ_COM_IN_I2O_IOP0 = (1 << 0),	153	MVS_IRQ_COM_IN_I2O_IOP0 = (1 << 0),
154	IRQ_COM_IN_I2O_IOP1 = (1 << 1),	154	MVS_IRQ_COM_IN_I2O_IOP1 = (1 << 1),
155	IRQ_COM_IN_I2O_IOP2 = (1 << 2),	155	MVS_IRQ_COM_IN_I2O_IOP2 = (1 << 2),
156	IRQ_COM_IN_I2O_IOP3 = (1 << 3),	156	MVS_IRQ_COM_IN_I2O_IOP3 = (1 << 3),
157	IRQ_COM_OUT_I2O_HOS0 = (1 << 4),	157	MVS_IRQ_COM_OUT_I2O_HOS0 = (1 << 4),
158	IRQ_COM_OUT_I2O_HOS1 = (1 << 5),	158	MVS_IRQ_COM_OUT_I2O_HOS1 = (1 << 5),
159	IRQ_COM_OUT_I2O_HOS2 = (1 << 6),	159	MVS_IRQ_COM_OUT_I2O_HOS2 = (1 << 6),
160	IRQ_COM_OUT_I2O_HOS3 = (1 << 7),	160	MVS_IRQ_COM_OUT_I2O_HOS3 = (1 << 7),
161	IRQ_PCIF_TO_CPU_DRBL0 = (1 << 8),	161	MVS_IRQ_PCIF_TO_CPU_DRBL0 = (1 << 8),
162	IRQ_PCIF_TO_CPU_DRBL1 = (1 << 9),	162	MVS_IRQ_PCIF_TO_CPU_DRBL1 = (1 << 9),
163	IRQ_PCIF_TO_CPU_DRBL2 = (1 << 10),	163	MVS_IRQ_PCIF_TO_CPU_DRBL2 = (1 << 10),
164	IRQ_PCIF_TO_CPU_DRBL3 = (1 << 11),	164	MVS_IRQ_PCIF_TO_CPU_DRBL3 = (1 << 11),
165	IRQ_PCIF_DRBL0 = (1 << 12),	165	MVS_IRQ_PCIF_DRBL0 = (1 << 12),
166	IRQ_PCIF_DRBL1 = (1 << 13),	166	MVS_IRQ_PCIF_DRBL1 = (1 << 13),
167	IRQ_PCIF_DRBL2 = (1 << 14),	167	MVS_IRQ_PCIF_DRBL2 = (1 << 14),
168	IRQ_PCIF_DRBL3 = (1 << 15),	168	MVS_IRQ_PCIF_DRBL3 = (1 << 15),
169	IRQ_XOR_A = (1 << 16),	169	MVS_IRQ_XOR_A = (1 << 16),
170	IRQ_XOR_B = (1 << 17),	170	MVS_IRQ_XOR_B = (1 << 17),
171	IRQ_SAS_A = (1 << 18),	171	MVS_IRQ_SAS_A = (1 << 18),
172	IRQ_SAS_B = (1 << 19),	172	MVS_IRQ_SAS_B = (1 << 19),
173	IRQ_CPU_CNTRL = (1 << 20),	173	MVS_IRQ_CPU_CNTRL = (1 << 20),
174	IRQ_GPIO = (1 << 21),	174	MVS_IRQ_GPIO = (1 << 21),
175	IRQ_UART = (1 << 22),	175	MVS_IRQ_UART = (1 << 22),
176	IRQ_SPI = (1 << 23),	176	MVS_IRQ_SPI = (1 << 23),
177	IRQ_I2C = (1 << 24),	177	MVS_IRQ_I2C = (1 << 24),
178	IRQ_SGPIO = (1 << 25),	178	MVS_IRQ_SGPIO = (1 << 25),
179	IRQ_COM_ERR = (1 << 29),	179	MVS_IRQ_COM_ERR = (1 << 29),
180	IRQ_I2O_ERR = (1 << 30),	180	MVS_IRQ_I2O_ERR = (1 << 30),
181	IRQ_PCIE_ERR = (1 << 31),	181	MVS_IRQ_PCIE_ERR = (1 << 31),
182	};	182	};
183		183
184	union reg_phy_cfg {	184	union reg_phy_cfg {