summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorGilad Broner <gbroner@codeaurora.org>2015-10-28 17:57:14 +0200
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:00:46 -0700
commitb18a536dcd0a7189af64de300f0ed512ef79bb06 (patch)
treeb94d62e8a92ec19c1c9781dc24dbc30f7bf641ba /drivers/scsi
parent8414f23377135c8d4e21ef7a825fcb7afb60e688 (diff)
crypto: ice: general driver clean-up
* Removed spinlock as it was not locking against anything * Removed conversion of interrupt status to error number as it is not used by API client, and in case several bits are set only 1 error is ever handled and the rest get lost. Instead pass to the client the complete status. * Removed redundant includes, variables * vops structure is returned after performing a lookup in the DTS. There's no need for that as we already know the structure to return. * Other minor corrections Change-Id: I6d2549ce04c9e4b19fdd8fe3dfee03d83bfd9d77 Signed-off-by: Gilad Broner <gbroner@codeaurora.org> [venkatg@codeaurora.org: dropped ice driver and mmc ice changes] Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ufs/ufs-qcom-ice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ufs/ufs-qcom-ice.c b/drivers/scsi/ufs/ufs-qcom-ice.c
index 37af20ed7955..aace487c6703 100644
--- a/drivers/scsi/ufs/ufs-qcom-ice.c
+++ b/drivers/scsi/ufs/ufs-qcom-ice.c
@@ -56,12 +56,12 @@ void ufs_qcom_ice_print_regs(struct ufs_qcom_host *qcom_host)
}
-static void ufs_qcom_ice_error_cb(void *host_ctrl, enum ice_error_code evt)
+static void ufs_qcom_ice_error_cb(void *host_ctrl, u32 error)
{
struct ufs_qcom_host *qcom_host = (struct ufs_qcom_host *)host_ctrl;
- dev_err(qcom_host->hba->dev, "%s: Error in ice operation %d",
- __func__, evt);
+ dev_err(qcom_host->hba->dev, "%s: Error in ice operation 0x%x",
+ __func__, error);
if (qcom_host->ice.state == UFS_QCOM_ICE_STATE_ACTIVE)
qcom_host->ice.state = UFS_QCOM_ICE_STATE_DISABLED;