From b18a536dcd0a7189af64de300f0ed512ef79bb06 Mon Sep 17 00:00:00 2001 From: Gilad Broner Date: Wed, 28 Oct 2015 17:57:14 +0200 Subject: [PATCH] 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 [venkatg@codeaurora.org: dropped ice driver and mmc ice changes] Signed-off-by: Venkat Gopalakrishnan --- drivers/scsi/ufs/ufs-qcom-ice.c | 6 +++--- 1 file 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;