linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alim Akhtar <alim.akhtar@samsung.com>
To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: JBottomley@odin.com, vinholikatti@gmail.com,
	amit.daniel@samsung.com, essuuj@gmail.com,
	devicetree@vger.kernel.org
Subject: [PATCH v2 09/11] scsi: ufs: return value of pwr_change_notify
Date: Thu, 17 Sep 2015 15:15:35 +0530	[thread overview]
Message-ID: <1442483137-32376-10-git-send-email-alim.akhtar@samsung.com> (raw)
In-Reply-To: <1442483137-32376-1-git-send-email-alim.akhtar@samsung.com>

From: Seungwon Jeon <essuuj@gmail.com>

Behavior of the "power mode change" contains vendor specific
operation known as pwr_change_notify. This change adds return
for pwr_change_notify to find success or failure.

Signed-off-by: Seungwon Jeon <essuuj@gmail.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/scsi/ufs/ufshcd.c |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index da52c45..0c9f319 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2579,14 +2579,18 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,
 		dev_err(hba->dev,
 			"%s: power mode change failed %d\n", __func__, ret);
 	} else {
-		if (hba->vops && hba->vops->pwr_change_notify)
-			hba->vops->pwr_change_notify(hba,
-				POST_CHANGE, NULL, pwr_mode);
+		if (hba->vops && hba->vops->pwr_change_notify) {
+			ret = hba->vops->pwr_change_notify(hba,
+					POST_CHANGE, NULL, pwr_mode);
+			if (ret)
+				goto out;
+		}
 
 		memcpy(&hba->pwr_info, pwr_mode,
 			sizeof(struct ufs_pa_layer_attr));
 	}
 
+out:
 	return ret;
 }
 
@@ -2601,14 +2605,18 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba,
 	struct ufs_pa_layer_attr final_params = { 0 };
 	int ret;
 
-	if (hba->vops && hba->vops->pwr_change_notify)
-		hba->vops->pwr_change_notify(hba,
-		     PRE_CHANGE, desired_pwr_mode, &final_params);
-	else
+	if (hba->vops && hba->vops->pwr_change_notify) {
+		ret = hba->vops->pwr_change_notify(hba,
+			PRE_CHANGE, desired_pwr_mode, &final_params);
+		if (ret)
+			goto out;
+	} else {
 		memcpy(&final_params, desired_pwr_mode, sizeof(final_params));
+	}
 
 	ret = ufshcd_change_power_mode(hba, &final_params);
 
+out:
 	return ret;
 }
 EXPORT_SYMBOL_GPL(ufshcd_config_pwr_mode);
-- 
1.7.10.4


  parent reply	other threads:[~2015-09-17  9:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-17  9:45 [PATCH v2 00/11] exynos-ufs: add support for Exynos Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 01/11] phy: exynos-ufs: add UFS PHY driver for EXYNOS SoC Alim Akhtar
2015-09-21 14:33   ` Rob Herring
2015-10-01  4:32     ` Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 02/11] scsi: ufs: add quirk to contain unconformable utrd field Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 03/11] scsi: ufs: add quirk to fix mishandling utrlclr/utmrlclr Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 04/11] scsi: ufs: add quirk not to allow reset of interrupt aggregation Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 05/11] scsi: ufs: add quirk to enable host controller without hce Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 06/11] scsi: ufs: add specific callback for nexus type Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 07/11] scsi: ufs: add add specific callback for hibern8 Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 08/11] scsi: ufs: make ufshcd_config_pwr_mode of non-static func Alim Akhtar
2015-09-17  9:45 ` Alim Akhtar [this message]
2015-09-17  9:45 ` [PATCH v2 10/11] scsi: ufs-exynos: add UFS host support for Exynos SoCs Alim Akhtar
2015-09-17  9:45 ` [PATCH v2 11/11] scsi: ufs: Add exynos ufs platform data Alim Akhtar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442483137-32376-10-git-send-email-alim.akhtar@samsung.com \
    --to=alim.akhtar@samsung.com \
    --cc=JBottomley@odin.com \
    --cc=amit.daniel@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=essuuj@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=vinholikatti@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).