Message ID | 20170420120145.7035-1-tkusumi@tuxera.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
> From: Tomohiro Kusumi <tkusumi@tuxera.com> > > MASK_EE_STATUS added by 66ec6d59 was unused, but it seems to have been > defined to do this. > > Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com> Subhash: Please review these two. Thanks!
On 2017-04-20 05:01, kusumi.tomohiro@gmail.com wrote: > From: Tomohiro Kusumi <tkusumi@tuxera.com> > > MASK_EE_STATUS added by 66ec6d59 was unused, but it seems to have been > defined to do this. > > Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com> > --- > drivers/scsi/ufs/ufshcd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 096e95b..9278666 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -4717,7 +4717,7 @@ static int ufshcd_disable_ee(struct ufs_hba > *hba, u16 mask) > goto out; > > val = hba->ee_ctrl_mask & ~mask; > - val &= 0xFFFF; /* 2 bytes */ > + val &= MASK_EE_STATUS; > err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, > QUERY_ATTR_IDN_EE_CONTROL, 0, 0, &val); > if (!err) > @@ -4745,7 +4745,7 @@ static int ufshcd_enable_ee(struct ufs_hba *hba, > u16 mask) > goto out; > > val = hba->ee_ctrl_mask | mask; > - val &= 0xFFFF; /* 2 bytes */ > + val &= MASK_EE_STATUS; > err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, > QUERY_ATTR_IDN_EE_CONTROL, 0, 0, &val); > if (!err) Looks good to me. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
> MASK_EE_STATUS added by 66ec6d59 was unused, but it seems to have been > defined to do this. Applied to 4.12/scsi-queue. Thank you!
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 096e95b..9278666 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4717,7 +4717,7 @@ static int ufshcd_disable_ee(struct ufs_hba *hba, u16 mask) goto out; val = hba->ee_ctrl_mask & ~mask; - val &= 0xFFFF; /* 2 bytes */ + val &= MASK_EE_STATUS; err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, QUERY_ATTR_IDN_EE_CONTROL, 0, 0, &val); if (!err) @@ -4745,7 +4745,7 @@ static int ufshcd_enable_ee(struct ufs_hba *hba, u16 mask) goto out; val = hba->ee_ctrl_mask | mask; - val &= 0xFFFF; /* 2 bytes */ + val &= MASK_EE_STATUS; err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, QUERY_ATTR_IDN_EE_CONTROL, 0, 0, &val); if (!err)