Staging: slicoss: Replace macro with inline defination in slicoss.c
authorMonam Agarwal <monamagarwal123@gmail.com>
Sun, 9 Mar 2014 13:10:23 +0000 (18:40 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Mar 2014 21:21:25 +0000 (14:21 -0700)
This patch moves the macro "SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)" to inline
in slicoss.c since it has been used only once.

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/slicoss/slicoss.c

index 611536eee768ffbc90a49396cb1d524a7cfe5049..55e4d827af2d40fb971c827eb4a15b9fe4f3c634 100644 (file)
@@ -144,18 +144,6 @@ static const struct pci_device_id slic_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
 
-#define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)                   \
-{                                                                       \
-       spin_lock_irqsave(&_adapter->handle_lock.lock,                  \
-                       _adapter->handle_lock.flags);                   \
-       _pslic_handle  =  _adapter->pfree_slic_handles;                 \
-       if (_pslic_handle) {                                            \
-               _adapter->pfree_slic_handles = _pslic_handle->next;     \
-       }                                                               \
-       spin_unlock_irqrestore(&_adapter->handle_lock.lock,             \
-                       _adapter->handle_lock.flags);                   \
-}
-
 static inline void slic_reg32_write(void __iomem *reg, u32 value, bool flush)
 {
        writel(value, reg);
@@ -1431,7 +1419,13 @@ static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page)
        while ((cmdcnt < SLIC_CMDQ_CMDSINPAGE) &&
               (adapter->slic_handle_ix < 256)) {
                /* Allocate and initialize a SLIC_HANDLE for this command */
-               SLIC_GET_SLIC_HANDLE(adapter, pslic_handle);
+               spin_lock_irqsave(&adapter->handle_lock.lock,
+                               adapter->handle_lock.flags);
+               pslic_handle  =  adapter->pfree_slic_handles;
+               if (pslic_handle)
+                       adapter->pfree_slic_handles = pslic_handle->next;
+               spin_unlock_irqrestore(&adapter->handle_lock.lock,
+                               adapter->handle_lock.flags);
                pslic_handle->type = SLIC_HANDLE_CMD;
                pslic_handle->address = (void *) cmd;
                pslic_handle->offset = (ushort) adapter->slic_handle_ix++;