Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b3bd4a4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I48dc723a,I20a61d31 into msm-next 

* changes:
  phy: qcom-ufs: remove unused variables to avoid Android make fail
  scsi: ufs: remove unused variables to avoid Android make fail
parents a63ea416 9a1b15e3

drivers/phy/qualcomm/phy-qcom-ufs.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int ufs_qcom_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy, 
			   struct ufs_qcom_phy_calibration *tbl_B,

			   int tbl_size_B, bool is_rate_B)

{

	int i;

	int ret = 0;



	if (!tbl_A) {

drivers/scsi/ufs/ufshcd.c

+0 −4
Original line number Diff line number Diff line
@@ -5603,10 +5603,6 @@ static int ufshcd_link_startup(struct ufs_hba *hba) 
	int ret;

	int retries = DME_LINKSTARTUP_RETRIES;

	bool link_startup_again = false;

	int hc_tx_lanes;

	int device_tx_lanes;

	int i;

	int err;



	/*

	 * If UFS device isn't active then we will have to issue link startup