On 07/06/2016 05:14 PM, Himanshu Madhani wrote:
> From: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
>
> Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_def.h | 6 ++++--
> drivers/scsi/qla2xxx/qla_os.c | 44 +++++++++++++++++++++---------------------
> 2 files changed, 26 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
> index c04d83e..ae4a747 100644
> --- a/drivers/scsi/qla2xxx/qla_def.h
> +++ b/drivers/scsi/qla2xxx/qla_def.h
> @@ -3130,7 +3130,7 @@ struct qla_hw_data {
> #define PCI_DEVICE_ID_QLOGIC_ISP2271 0x2271
> #define PCI_DEVICE_ID_QLOGIC_ISP2261 0x2261
>
> - uint32_t device_type;
> + uint32_t isp_type;
> #define DT_ISP2100 BIT_0
> #define DT_ISP2200 BIT_1
> #define DT_ISP2300 BIT_2
> @@ -3155,6 +3155,7 @@ struct qla_hw_data {
> #define DT_ISP2261 BIT_21
> #define DT_ISP_LAST (DT_ISP2261 << 1)
>
> + uint32_t device_type;
> #define DT_T10_PI BIT_25
> #define DT_IIDMA BIT_26
> #define DT_FWI2 BIT_27
> @@ -3162,7 +3163,8 @@ struct qla_hw_data {
> #define DT_OEM_001 BIT_29
> #define DT_ISP2200A BIT_30
> #define DT_EXTENDED_IDS BIT_31
> -#define DT_MASK(ha) ((ha)->device_type & (DT_ISP_LAST - 1))
> +
> +#define DT_MASK(ha) ((ha)->isp_type & (DT_ISP_LAST - 1))
> #define IS_QLA2100(ha) (DT_MASK(ha) & DT_ISP2100)
> #define IS_QLA2200(ha) (DT_MASK(ha) & DT_ISP2200)
> #define IS_QLA2300(ha) (DT_MASK(ha) & DT_ISP2300)
Hmm.
I would've thought that you take the opportunity to reshuffle the
device_type bit to start with '0'; as it stands now it doesn't
really buy you anything right now...
But anyway.
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
