Skip to content

Commit 5daf1bb

Browse files
quic-kdybciovinodkoul
authored andcommitted
phy: qcom: qmp-combo: Rename 'mode' to 'phy_mode'
There are a numbers of ""modes"" involved: USB mode, Type-C mode (with its altmodes), phy_mode and QMP_PHY mode (DP/combo/USB/off). Rename the generic sounding 'mode' to 'phy_mode' to hopefully make the code easier to follow. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on Lenovo Thinkpad T14S Link: https://lore.kernel.org/r/20250807-topic-4ln_dp_respin-v4-2-43272d6eca92@oss.qualcomm.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 3bad7fe commit 5daf1bb

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ struct qmp_combo {
18461846
int init_count;
18471847

18481848
struct phy *usb_phy;
1849-
enum phy_mode mode;
1849+
enum phy_mode phy_mode;
18501850
unsigned int usb_init_count;
18511851

18521852
struct phy *dp_phy;
@@ -3282,7 +3282,7 @@ static int qmp_combo_usb_set_mode(struct phy *phy, enum phy_mode mode, int submo
32823282
{
32833283
struct qmp_combo *qmp = phy_get_drvdata(phy);
32843284

3285-
qmp->mode = mode;
3285+
qmp->phy_mode = mode;
32863286

32873287
return 0;
32883288
}
@@ -3311,8 +3311,8 @@ static void qmp_combo_enable_autonomous_mode(struct qmp_combo *qmp)
33113311
void __iomem *pcs_misc = qmp->pcs_misc;
33123312
u32 intr_mask;
33133313

3314-
if (qmp->mode == PHY_MODE_USB_HOST_SS ||
3315-
qmp->mode == PHY_MODE_USB_DEVICE_SS)
3314+
if (qmp->phy_mode == PHY_MODE_USB_HOST_SS ||
3315+
qmp->phy_mode == PHY_MODE_USB_DEVICE_SS)
33163316
intr_mask = ARCVR_DTCT_EN | ALFPS_DTCT_EN;
33173317
else
33183318
intr_mask = ARCVR_DTCT_EN | ARCVR_DTCT_EVENT_SEL;
@@ -3355,7 +3355,7 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
33553355
{
33563356
struct qmp_combo *qmp = dev_get_drvdata(dev);
33573357

3358-
dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qmp->mode);
3358+
dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qmp->phy_mode);
33593359

33603360
if (!qmp->init_count) {
33613361
dev_vdbg(dev, "PHY not initialized, bailing out\n");
@@ -3375,7 +3375,7 @@ static int __maybe_unused qmp_combo_runtime_resume(struct device *dev)
33753375
struct qmp_combo *qmp = dev_get_drvdata(dev);
33763376
int ret = 0;
33773377

3378-
dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qmp->mode);
3378+
dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qmp->phy_mode);
33793379

33803380
if (!qmp->init_count) {
33813381
dev_vdbg(dev, "PHY not initialized, bailing out\n");

0 commit comments

Comments
 (0)