4 files changed, 19 insertions, 23 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index d6a0074b9dc3..c4e8b9aa3827 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -952,7 +952,6 @@ mpt_put_msg_frame_hi_pri(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mpt_free_msg_frame - Place MPT request frame back on FreeQ.
- *      @handle: Handle of registered MPT protocol driver
  *      @ioc: Pointer to MPT adapter structure
  *      @mf: Pointer to MPT request frame
  *
@@ -4563,7 +4562,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
                         failcnt++;
                 hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF);
                 /* don't overflow our IOC hs_reply[] buffer! */
-                if (u16cnt < sizeof(ioc->hs_reply) / sizeof(ioc->hs_reply[0]))
+                if (u16cnt < ARRAY_SIZE(ioc->hs_reply))
                         hs_reply[u16cnt] = hword;
                 CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
         }
@@ -5422,7 +5421,6 @@ mpt_raid_phys_disk_pg0(MPT_ADAPTER *ioc, u8 phys_disk_num, pRaidPhysDiskPage0_t
 /**
  *      mpt_findImVolumes - Identify IDs of hidden disks and RAID Volumes
  *      @ioc: Pointer to a Adapter Strucutre
- *      @portnum: IOC port number
  *
  *      Return:
  *      0 on success
@@ -6939,7 +6937,6 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
 /**
  *      mpt_spi_log_info - Log information returned from SCSI Parallel IOC.
  *      @ioc: Pointer to MPT_ADAPTER structure
- *      @mr: Pointer to MPT reply frame
  *      @log_info: U32 LogInfo word from the IOC
  *
  *      Refer to lsi/sp_log.h.
@@ -7176,7 +7173,7 @@ union loginfo_type {
 
         sas_loginfo.loginfo = log_info;
         if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) &&
-            (sas_loginfo.dw.originator < sizeof(originator_str)/sizeof(char*)))
+            (sas_loginfo.dw.originator < ARRAY_SIZE(originator_str)))
                 return;
 
         originator_desc = originator_str[sas_loginfo.dw.originator];
@@ -7185,21 +7182,21 @@ union loginfo_type {
 
                 case 0:  /* IOP */
                         if (sas_loginfo.dw.code <
-                            sizeof(iop_code_str)/sizeof(char*))
+                            ARRAY_SIZE(iop_code_str))
                                 code_desc = iop_code_str[sas_loginfo.dw.code];
                         break;
                 case 1:  /* PL */
                         if (sas_loginfo.dw.code <
-                            sizeof(pl_code_str)/sizeof(char*))
+                            ARRAY_SIZE(pl_code_str))
                                 code_desc = pl_code_str[sas_loginfo.dw.code];
                         break;
                 case 2:  /* IR */
                         if (sas_loginfo.dw.code >=
-                            sizeof(ir_code_str)/sizeof(char*))
+                            ARRAY_SIZE(ir_code_str))
                                 break;
                         code_desc = ir_code_str[sas_loginfo.dw.code];
                         if (sas_loginfo.dw.subcode >=
-                            sizeof(raid_sub_code_str)/sizeof(char*))
+                            ARRAY_SIZE(raid_sub_code_str))
                         break;
                         if (sas_loginfo.dw.code == 0)
                                 sub_code_desc =
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 603ffd008c73..a13f6eecd25b 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -815,7 +815,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority)
  * @priority: 0 = put it on the timer queue, 1 = put it on the immediate queue
  */
 {
-        struct mpt_lan_priv *priv = dev->priv;
+        struct mpt_lan_priv *priv = netdev_priv(dev);
         
         if (test_and_set_bit(0, &priv->post_buckets_active) == 0) {
                 if (priority) {
@@ -834,7 +834,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority)
 static int
 mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb)
 {
-        struct mpt_lan_priv *priv = dev->priv;
+        struct mpt_lan_priv *priv = netdev_priv(dev);
 
         skb->protocol = mpt_lan_type_trans(skb, dev);
 
@@ -866,7 +866,7 @@ mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb)
 static int
 mpt_lan_receive_post_turbo(struct net_device *dev, u32 tmsg)
 {
-        struct mpt_lan_priv *priv = dev->priv;
+        struct mpt_lan_priv *priv = netdev_priv(dev);
         MPT_ADAPTER *mpt_dev = priv->mpt_dev;
         struct sk_buff *skb, *old_skb;
         unsigned long flags;
@@ -921,7 +921,7 @@ static int
 mpt_lan_receive_post_free(struct net_device *dev,
                           LANReceivePostReply_t *pRecvRep)
 {
-        struct mpt_lan_priv *priv = dev->priv;
+        struct mpt_lan_priv *priv = netdev_priv(dev);
         MPT_ADAPTER *mpt_dev = priv->mpt_dev;
         unsigned long flags;
         struct sk_buff *skb;
@@ -976,7 +976,7 @@ static int
 mpt_lan_receive_post_reply(struct net_device *dev,
                            LANReceivePostReply_t *pRecvRep)
 {
-        struct mpt_lan_priv *priv = dev->priv;
+        struct mpt_lan_priv *priv = netdev_priv(dev);
         MPT_ADAPTER *mpt_dev = priv->mpt_dev;
         struct sk_buff *skb, *old_skb;
         unsigned long flags;
@@ -1427,11 +1427,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
                        "registered as '%s'\n", ioc->name, dev->name);
                 printk(KERN_INFO MYNAM ": %s/%s: "
-                       "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
+                       "LanAddr = %pM\n",
                        IOC_AND_NETDEV_NAMES_s_s(dev),
-                       dev->dev_addr[0], dev->dev_addr[1],
-                       dev->dev_addr[2], dev->dev_addr[3],
-                       dev->dev_addr[4], dev->dev_addr[5]);
+                       dev->dev_addr);
         
                 ioc->netdev = dev;
 
@@ -1516,9 +1514,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
 
                 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
                                 NETDEV_PTR_TO_IOC_NAME_s(dev));
-                printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                fch->saddr[0], fch->saddr[1], fch->saddr[2],
-                                fch->saddr[3], fch->saddr[4], fch->saddr[5]);
+                printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
+                                fch->saddr);
         }
 
         if (*fch->daddr & 1) {
@@ -1537,7 +1534,6 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
 
         fcllc = (struct fcllc *)skb->data;
 
-
         /* Strip the SNAP header from ARP packets since we don't
          * pass them through to the 802.2/SNAP layers.
          */
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 33927ee7dc3b..c171afa93239 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -122,7 +122,7 @@ MODULE_DESCRIPTION(LANAME);
 #define dlprintk(x)
 #endif
 
-#define NETDEV_TO_LANPRIV_PTR(d)        ((struct mpt_lan_priv *)(d)->priv)
+#define NETDEV_TO_LANPRIV_PTR(d)        ((struct mpt_lan_priv *)netdev_priv(d))
 #define NETDEV_PTR_TO_IOC_NAME_s(d)     (NETDEV_TO_LANPRIV_PTR(d)->mpt_dev->name)
 #define IOC_AND_NETDEV_NAMES_s_s(d)     NETDEV_PTR_TO_IOC_NAME_s(d), (d)->name
 
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index d62fd4f6b52e..ee090413e598 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2008,6 +2008,9 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
                 return FAILED;
         }
 
+        /* make sure we have no outstanding commands at this stage */
+        mptscsih_flush_running_cmds(hd);
+
         ioc = hd->ioc;
         printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n",
             ioc->name, SCpnt);