MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 5070e960addeb4571feb85878de040e42d1d92a2..bc985b7af4d57858e2712e81a8a3de44ffe47242 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -544,7 +544,7 @@ static struct irq_chip octeon_irq_chip_ciu1 = {
 
 #ifdef CONFIG_PCI_MSI
 
-static DEFINE_SPINLOCK(octeon_irq_msi_lock);
+static DEFINE_RAW_SPINLOCK(octeon_irq_msi_lock);
 
 static void octeon_irq_msi_ack(unsigned int irq)
 {
@@ -586,12 +586,12 @@ static void octeon_irq_msi_enable(unsigned int irq)
                 */
                uint64_t en;
                unsigned long flags;
-               spin_lock_irqsave(&octeon_irq_msi_lock, flags);
+               raw_spin_lock_irqsave(&octeon_irq_msi_lock, flags);
                en = cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);
                en |= 1ull << (irq - OCTEON_IRQ_MSI_BIT0);
                cvmx_write_csr(CVMX_PEXP_NPEI_MSI_ENB0, en);
                cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);
-               spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);
+               raw_spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);
        }
 }
 
@@ -608,12 +608,12 @@ static void octeon_irq_msi_disable(unsigned int irq)
                 */
                uint64_t en;
                unsigned long flags;
-               spin_lock_irqsave(&octeon_irq_msi_lock, flags);
+               raw_spin_lock_irqsave(&octeon_irq_msi_lock, flags);
                en = cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);
                en &= ~(1ull << (irq - OCTEON_IRQ_MSI_BIT0));
                cvmx_write_csr(CVMX_PEXP_NPEI_MSI_ENB0, en);
                cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);
-               spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);
+               raw_spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);
        }
 }