[SCSI] lpfc: minor syntax fixes

Stop gcc complaining about undefined variables

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 71d2c8d3b001..a2e15436730e 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -948,10 +948,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
                                         "10-port ", "PCIe"};
                         break;
                 default:
+                        m = (typeof(m)){ 0 };
                         break;
                 }
                 break;
         default:
+                m = (typeof(m)){ 0 };
                 break;
         }
 
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index acd64c49e849..cdcd2535803f 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -23,10 +23,13 @@
 struct lpfc_hba;
 
 #define list_remove_head(list, entry, type, member)             \
+        do {                                                    \
+        entry = NULL;                                           \
         if (!list_empty(list)) {                                \
                 entry = list_entry((list)->next, type, member); \
                 list_del_init(&entry->member);                  \
-        }
+        }                                                       \
+        } while(0)
 
 #define list_get_first(list, type, member)                      \
         (list_empty(list)) ? NULL :                             \