Merge "scsi: ufs: add index details to query error messages" (ba2c4d19) · Commits · e / devices / android_kernel_sony_msm8994

drivers/scsi/ufs/ufshcd.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -1500,8 +1500,8 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
		err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, QUERY_REQ_TIMEOUT);

		if (err) {
		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, err = %d\n",
		__func__, opcode, idn, err);
		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, index %d, err = %d\n",
		__func__, opcode, idn, index, err);
		goto out_unlock;
		}

		@@ -1575,8 +1575,8 @@ int ufshcd_query_descriptor(struct ufs_hba *hba,
		err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, QUERY_REQ_TIMEOUT);

		if (err) {
		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, err = %d\n",
		__func__, opcode, idn, err);
		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, index %d, err = %d\n",
		__func__, opcode, idn, index, err);
		goto out_unlock;
		}

		@@ -1639,8 +1639,9 @@ static int ufshcd_read_desc_param(struct ufs_hba *hba,
		(desc_buf[QUERY_DESC_LENGTH_OFFSET] !=
		ufs_query_desc_max_size[desc_id])
		\|\| (desc_buf[QUERY_DESC_DESC_TYPE_OFFSET] != desc_id)) {
		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d param_offset %d buff_len %d ret %d",
		__func__, desc_id, param_offset, buff_len, ret);
		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d, param_offset %d, buff_len %d ,index %d, ret %d",
		__func__, desc_id, param_offset, buff_len,
		desc_index, ret);
		if (!ret)
		ret = -EINVAL;