Skip to content

Commit 98e87cc

Browse files
Charles Hankwilczynski
authored andcommitted
PCI: mediatek-gen3: Fix inconsistent indentation
Fix the following inconsistent indentation warning: drivers/pci/controller/pcie-mediatek-gen3.c:922 mtk_pcie_parse_port() warn: inconsistent indenting Found using Smatch. No functional changes intended. Signed-off-by: Charles Han <[email protected]> Link: https://lore.kernel.org/r/[email protected] [kwilczynski: commit log, refactor if-statement around num_lanes to make it more readable, wrap overly long lines to fit 80 colums] Signed-off-by: Krzysztof Wilczyński <[email protected]>
1 parent 249b782 commit 98e87cc

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

drivers/pci/controller/pcie-mediatek-gen3.c

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ static int mtk_pcie_set_trans_table(struct mtk_gen3_pcie *pcie,
354354

355355
dev_dbg(pcie->dev, "set %s trans window[%d]: cpu_addr = %#llx, pci_addr = %#llx, size = %#llx\n",
356356
range_type, *num, (unsigned long long)cpu_addr,
357-
(unsigned long long)pci_addr, (unsigned long long)table_size);
357+
(unsigned long long)pci_addr,
358+
(unsigned long long)table_size);
358359

359360
cpu_addr += table_size;
360361
pci_addr += table_size;
@@ -889,7 +890,8 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
889890
for (i = 0; i < num_resets; i++)
890891
pcie->phy_resets[i].id = pcie->soc->phy_resets.id[i];
891892

892-
ret = devm_reset_control_bulk_get_optional_shared(dev, num_resets, pcie->phy_resets);
893+
ret = devm_reset_control_bulk_get_optional_shared(dev, num_resets,
894+
pcie->phy_resets);
893895
if (ret) {
894896
dev_err(dev, "failed to get PHY bulk reset\n");
895897
return ret;
@@ -919,13 +921,14 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
919921
return pcie->num_clks;
920922
}
921923

922-
ret = of_property_read_u32(dev->of_node, "num-lanes", &num_lanes);
923-
if (ret == 0) {
924-
if (num_lanes == 0 || num_lanes > 16 || (num_lanes != 1 && num_lanes % 2))
924+
ret = of_property_read_u32(dev->of_node, "num-lanes", &num_lanes);
925+
if (ret == 0) {
926+
if (num_lanes == 0 || num_lanes > 16 ||
927+
(num_lanes != 1 && num_lanes % 2))
925928
dev_warn(dev, "invalid num-lanes, using controller defaults\n");
926-
else
929+
else
927930
pcie->num_lanes = num_lanes;
928-
}
931+
}
929932

930933
return 0;
931934
}
@@ -986,7 +989,8 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
986989
goto err_phy_on;
987990
}
988991

989-
err = reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
992+
err = reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets,
993+
pcie->phy_resets);
990994
if (err) {
991995
dev_err(dev, "failed to deassert PHYs\n");
992996
goto err_phy_deassert;
@@ -1031,7 +1035,8 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
10311035
err_clk_prepare_enable:
10321036
pm_runtime_put_sync(dev);
10331037
pm_runtime_disable(dev);
1034-
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
1038+
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets,
1039+
pcie->phy_resets);
10351040
err_phy_deassert:
10361041
phy_power_off(pcie->phy);
10371042
err_phy_on:
@@ -1055,7 +1060,8 @@ static int mtk_pcie_power_up(struct mtk_gen3_pcie *pcie)
10551060
usleep_range(PCIE_MTK_RESET_TIME_US, 2 * PCIE_MTK_RESET_TIME_US);
10561061

10571062
/* PHY power on and enable pipe clock */
1058-
err = reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
1063+
err = reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets,
1064+
pcie->phy_resets);
10591065
if (err) {
10601066
dev_err(dev, "failed to deassert PHYs\n");
10611067
return err;
@@ -1095,7 +1101,8 @@ static int mtk_pcie_power_up(struct mtk_gen3_pcie *pcie)
10951101
err_phy_on:
10961102
phy_exit(pcie->phy);
10971103
err_phy_init:
1098-
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
1104+
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets,
1105+
pcie->phy_resets);
10991106

11001107
return err;
11011108
}
@@ -1110,7 +1117,8 @@ static void mtk_pcie_power_down(struct mtk_gen3_pcie *pcie)
11101117

11111118
phy_power_off(pcie->phy);
11121119
phy_exit(pcie->phy);
1113-
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
1120+
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets,
1121+
pcie->phy_resets);
11141122
}
11151123

11161124
static int mtk_pcie_get_controller_max_link_speed(struct mtk_gen3_pcie *pcie)
@@ -1137,7 +1145,8 @@ static int mtk_pcie_setup(struct mtk_gen3_pcie *pcie)
11371145
* Deassert the line in order to avoid unbalance in deassert_count
11381146
* counter since the bulk is shared.
11391147
*/
1140-
reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);
1148+
reset_control_bulk_deassert(pcie->soc->phy_resets.num_resets,
1149+
pcie->phy_resets);
11411150

11421151
/* Don't touch the hardware registers before power up */
11431152
err = pcie->soc->power_up(pcie);

0 commit comments

Comments
 (0)