staging: unisys: convert pack pragma to __packed

[karo-tx-linux.git] / drivers / staging / slicoss / slicoss.c

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 39c140ccdcbb3609c0e2782eda04f986921932af..a609f3e67256aba12dbfda1fb9e1e2d3958c2f67 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -147,10 +147,7 @@ static inline void slic_reg64_write(struct adapter *adapter, void __iomem *reg,
        unsigned long flags;
 
        spin_lock_irqsave(&adapter->bit64reglock, flags);
-       if (paddrh != adapter->curaddrupper) {
-               adapter->curaddrupper = paddrh;
-               writel(paddrh, regh);
-       }
+       writel(paddrh, regh);
        writel(value, reg);
        if (flush)
                mb();
@@ -1395,7 +1392,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
        unsigned long flags;
 
        spin_lock_irqsave(&adapter->cmdq_free.lock, flags);
-       spin_lock_irqsave(&adapter->cmdq_done.lock, flags);
+       spin_lock(&adapter->cmdq_done.lock);
        outstanding = adapter->cmdq_all.count - adapter->cmdq_done.count;
        outstanding -= adapter->cmdq_free.count;
        hcmd = adapter->cmdq_all.head;
@@ -1426,7 +1423,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
                        "free_count %d != all count %d\n",
                        adapter->cmdq_free.count, adapter->cmdq_all.count);
        }
-       spin_unlock_irqrestore(&adapter->cmdq_done.lock, flags);
+       spin_unlock(&adapter->cmdq_done.lock);
        spin_unlock_irqrestore(&adapter->cmdq_free.lock, flags);
 }