[PATCH 5/8] staging: dwc2: remove use of NO_FS_PHY_HW_CHECKS macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



NO_FS_PHY_HW_CHECKS is never defined, so remove the conditional
code that checks for it being set

Signed-off-by: Paul Zimmerman <paulz@xxxxxxxxxxxx>
---
 drivers/staging/dwc2/core.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c
index 8597836..6149fbc 100644
--- a/drivers/staging/dwc2/core.c
+++ b/drivers/staging/dwc2/core.c
@@ -2169,10 +2169,8 @@ void dwc2_set_param_host_channels(struct dwc2_hsotg *hsotg, int val)
 
 void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val)
 {
-#ifndef NO_FS_PHY_HW_CHECKS
 	int valid = 0;
 	u32 hs_phy_type, fs_phy_type;
-#endif
 
 	if (DWC2_OUT_OF_BOUNDS(val, DWC2_PHY_TYPE_PARAM_FS,
 			       DWC2_PHY_TYPE_PARAM_ULPI)) {
@@ -2181,15 +2179,9 @@ void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val)
 			dev_err(hsotg->dev, "phy_type must be 0, 1 or 2\n");
 		}
 
-#ifndef NO_FS_PHY_HW_CHECKS
 		valid = 0;
-#else
-		val = DWC2_PHY_TYPE_PARAM_FS;
-		dev_dbg(hsotg->dev, "Setting phy_type to %d\n", val);
-#endif
 	}
 
-#ifndef NO_FS_PHY_HW_CHECKS
 	hs_phy_type = hsotg->hw_params.hs_phy_type;
 	fs_phy_type = hsotg->hw_params.fs_phy_type;
 	if (val == DWC2_PHY_TYPE_PARAM_UTMI &&
@@ -2219,7 +2211,6 @@ void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val)
 		}
 		dev_dbg(hsotg->dev, "Setting phy_type to %d\n", val);
 	}
-#endif
 
 	hsotg->core_params->phy_type = val;
 }
@@ -2382,9 +2373,7 @@ void dwc2_set_param_ts_dline(struct dwc2_hsotg *hsotg, int val)
 
 void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val)
 {
-#ifndef NO_FS_PHY_HW_CHECKS
 	int valid = 1;
-#endif
 
 	if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
 		if (val >= 0) {
@@ -2392,15 +2381,9 @@ void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val)
 			dev_err(hsotg->dev, "i2c_enable must be 0 or 1\n");
 		}
 
-#ifndef NO_FS_PHY_HW_CHECKS
 		valid = 0;
-#else
-		val = 0;
-		dev_dbg(hsotg->dev, "Setting i2c_enable to %d\n", val);
-#endif
 	}
 
-#ifndef NO_FS_PHY_HW_CHECKS
 	if (val == 1 && !(hsotg->hw_params.i2c_enable))
 		valid = 0;
 
@@ -2412,7 +2395,6 @@ void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val)
 		val = hsotg->hw_params.i2c_enable;
 		dev_dbg(hsotg->dev, "Setting i2c_enable to %d\n", val);
 	}
-#endif
 
 	hsotg->core_params->i2c_enable = val;
 }
-- 
1.8.5.rc3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux