FIXME: Force return of phy id without condition

changchingyew · changchingyew · commit 7e55674046b2 · 2025-10-15T02:11:17.000+08:00
Signed-off-by: Yew, Chang Ching &lt;chang.ching.yew@intel.com&gt;
diff --git a/drivers/media/i2c/maxim-serdes/max96724.c b/drivers/media/i2c/maxim-serdes/max96724.c
@@ -300,13 +300,14 @@ static unsigned int max96724_phy_id(struct max_des *des, struct max_des_phy *phy
 {
 	unsigned int num_hw_data_lanes = max_des_phy_hw_data_lanes(des, phy);
 
+#if 0 // FIXME
 	/* PHY 1 is the master PHY when combining PHY 0 and PHY 1. */
 	if (phy->index == 0 && num_hw_data_lanes == 4)
 		return 1;
 
 	if (phy->index == 1 && !des->phys[1].enabled)
 		return 0;
-
+#endif
 	return phy->index;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -300,13 +300,14 @@ static unsigned int max96724_phy_id(struct max_des des, struct max_des_phy phy`
`300`	`300`	`{`
`301`	`301`	`unsigned int num_hw_data_lanes = max_des_phy_hw_data_lanes(des, phy);`
`302`	`302`
	`303`	`+#if 0 // FIXME`
`303`	`304`	`/* PHY 1 is the master PHY when combining PHY 0 and PHY 1. */`
`304`	`305`	`if (phy->index == 0 && num_hw_data_lanes == 4)`
`305`	`306`	`return 1;`
`306`	`307`
`307`	`308`	`if (phy->index == 1 && !des->phys[1].enabled)`
`308`	`309`	`return 0;`
`309`		`-`
	`310`	`+#endif`
`310`	`311`	`return phy->index;`
`311`	`312`	`}`
`312`	`313`