Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / scsi / megaraid / megaraid_sas_fp.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index e8b7a69428b6cd5e25c2339e6deaa73c070e8f22..be57b18675a4b1b96243e067a71cd2db2a80c1c5 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -150,7 +150,7 @@ u16 MR_LdSpanArrayGet(u32 ld, u32 span, struct MR_DRV_RAID_MAP_ALL *map)
        return le16_to_cpu(map->raidMap.ldSpanMap[ld].spanBlock[span].span.arrayRef);
 }
 
-u16 MR_PdDevHandleGet(u32 pd, struct MR_DRV_RAID_MAP_ALL *map)
+__le16 MR_PdDevHandleGet(u32 pd, struct MR_DRV_RAID_MAP_ALL *map)
 {
        return map->raidMap.devHndlInfo[pd].curDevHdl;
 }
@@ -743,7 +743,7 @@ static u8 mr_spanset_get_phy_params(struct megasas_instance *instance, u32 ld,
        u8      retval = TRUE;
        u8      do_invader = 0;
        u64     *pdBlock = &io_info->pdBlock;
-       u16     *pDevHandle = &io_info->devHandle;
+       __le16  *pDevHandle = &io_info->devHandle;
        u32     logArm, rowMod, armQ, arm;
 
        if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER ||
@@ -777,7 +777,7 @@ static u8 mr_spanset_get_phy_params(struct megasas_instance *instance, u32 ld,
        if (pd != MR_PD_INVALID)
                *pDevHandle = MR_PdDevHandleGet(pd, map);
        else {
-               *pDevHandle = MR_PD_INVALID;
+               *pDevHandle = cpu_to_le16(MR_PD_INVALID);
                if ((raid->level >= 5) &&
                        (!do_invader  || (do_invader &&
                        (raid->regTypeReqOnRead != REGION_TYPE_UNUSED))))
@@ -825,7 +825,7 @@ u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow,
        u8          retval = TRUE;
        u8          do_invader = 0;
        u64         *pdBlock = &io_info->pdBlock;
-       u16         *pDevHandle = &io_info->devHandle;
+       __le16      *pDevHandle = &io_info->devHandle;
 
        if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER ||
                instance->pdev->device == PCI_DEVICE_ID_LSI_FURY))
@@ -872,7 +872,8 @@ u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow,
                /* Get dev handle from Pd. */
                *pDevHandle = MR_PdDevHandleGet(pd, map);
        else {
-               *pDevHandle = MR_PD_INVALID; /* set dev handle as invalid. */
+               /* set dev handle as invalid. */
+               *pDevHandle = cpu_to_le16(MR_PD_INVALID);
                if ((raid->level >= 5) &&
                        (!do_invader  || (do_invader &&
                        (raid->regTypeReqOnRead != REGION_TYPE_UNUSED))))
@@ -1117,7 +1118,7 @@ MR_BuildRaidContext(struct megasas_instance *instance,
                                        ref_in_start_stripe, io_info,
                                        pRAID_Context, map);
                /* If IO on an invalid Pd, then FP is not possible.*/
-               if (io_info->devHandle == MR_PD_INVALID)
+               if (io_info->devHandle == cpu_to_le16(MR_PD_INVALID))
                        io_info->fpOkForIo = FALSE;
                return retval;
        } else if (isRead) {
@@ -1349,11 +1350,11 @@ u8 megasas_get_best_arm_pd(struct megasas_instance *instance,
        return io_info->pd_after_lb;
 }
 
-u16 get_updated_dev_handle(struct megasas_instance *instance,
+__le16 get_updated_dev_handle(struct megasas_instance *instance,
        struct LD_LOAD_BALANCE_INFO *lbInfo, struct IO_REQUEST_INFO *io_info)
 {
        u8 arm_pd;
-       u16 devHandle;
+       __le16 devHandle;
        struct fusion_context *fusion;
        struct MR_DRV_RAID_MAP_ALL *drv_map;