summaryrefslogtreecommitdiffstats
path: root/drivers/phy/intel
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-05-27 15:45:06 +0200
committerVinod Koul <vkoul@kernel.org>2020-06-24 14:11:40 +0200
commit6153224bef8b218ecf9bf541b6154ff72fc4c54b (patch)
tree064c44caddd91a8312cfe94a02d16feb969e77cb /drivers/phy/intel
parentphy: intel: Fix compilation error on FIELD_PREP usage (diff)
downloadlinux-6153224bef8b218ecf9bf541b6154ff72fc4c54b.tar.xz
linux-6153224bef8b218ecf9bf541b6154ff72fc4c54b.zip
phy: intel: fix enum type mismatch warning
clang points out that a local variable is initialized with an enum value of the wrong type: drivers/phy/intel/phy-intel-combo.c:202:34: error: implicit conversion from enumeration type 'enum intel_phy_mode' to different enumeration type 'enum intel_combo_mode' [-Werror,-Wenum-conversion] enum intel_combo_mode cb_mode = PHY_PCIE_MODE; ~~~~~~~ ^~~~~~~~~~~~~ >From reading the code, it seems that this was not only the wrong type, but not even supposed to be a code path that can happen in practice. Change the code to have no default phy mode but instead return an error for invalid input. Fixes: ac0a95a3ea78 ("phy: intel: Add driver support for ComboPhy") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Dilip Kota <eswara.kota@linux.intel.com> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Link: https://lore.kernel.org/r/20200527134518.908624-1-arnd@arndb.de Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy/intel')
-rw-r--r--drivers/phy/intel/phy-intel-combo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/phy/intel/phy-intel-combo.c b/drivers/phy/intel/phy-intel-combo.c
index 254ea7cba7ca..360b1eb2ebd6 100644
--- a/drivers/phy/intel/phy-intel-combo.c
+++ b/drivers/phy/intel/phy-intel-combo.c
@@ -199,7 +199,7 @@ static int intel_cbphy_pcie_dis_pad_refclk(struct intel_cbphy_iphy *iphy)
static int intel_cbphy_set_mode(struct intel_combo_phy *cbphy)
{
- enum intel_combo_mode cb_mode = PHY_PCIE_MODE;
+ enum intel_combo_mode cb_mode;
enum aggregated_mode aggr = cbphy->aggr_mode;
struct device *dev = cbphy->dev;
enum intel_phy_mode mode;
@@ -224,6 +224,8 @@ static int intel_cbphy_set_mode(struct intel_combo_phy *cbphy)
cb_mode = SATA0_SATA1_MODE;
break;
+ default:
+ return -EINVAL;
}
ret = regmap_write(cbphy->hsiocfg, REG_COMBO_MODE(cbphy->bid), cb_mode);