Commit 286871a6 authored by Maurizio Lombardi's avatar Maurizio Lombardi Committed by Martin K. Petersen

scsi: lpfc: fix "integer constant too large" error on 32bit archs

cc1: warnings being treated as errors
drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_get_wwpn':
drivers/scsi/lpfc/lpfc_init.c:3253: error: integer constant is too large for 'long' type
Signed-off-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 44fd7fe3
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/bitops.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
...@@ -3728,9 +3729,7 @@ lpfc_get_wwpn(struct lpfc_hba *phba) ...@@ -3728,9 +3729,7 @@ lpfc_get_wwpn(struct lpfc_hba *phba)
if (phba->sli_rev == LPFC_SLI_REV4) if (phba->sli_rev == LPFC_SLI_REV4)
return be64_to_cpu(wwn); return be64_to_cpu(wwn);
else else
return (((wwn & 0xffffffff00000000) >> 32) | return rol64(wwn, 32);
((wwn & 0x00000000ffffffff) << 32));
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment