Skip to contentSkip to conversation

net: qcom/emac: fix device tree initialization

PATCH Applied Timur Tabi 2 participants 2 messages May 27, 2018 – May 29, 2018

Subsystems (3)
Networking Network drivers Qualcomm emac gigabit Ethernet driver
lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 net: qcom/emac: fix device tree initialization

Commit "net: qcom/emac: Encapsulate sgmii ops under one structure" introduced the sgmii_ops structure, but did not correctly initialize it on device tree platforms. This resulted in compiler warnings when ACPI is not enabled.

Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Timur Tabi <[email protected]>
---
 drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c +13 -3
index 562420b834df..e78e5db39458 100644
@@ -273,6 +273,14 @@ static int emac_sgmii_common_link_change(struct emac_adapter *adpt, bool linkup)
 	return 0;
 }
 
+static struct sgmii_ops fsm9900_ops = {
+	.init = emac_sgmii_init_fsm9900,
+	.open = emac_sgmii_common_open,
+	.close = emac_sgmii_common_close,
+	.link_change = emac_sgmii_common_link_change,
+	.reset = emac_sgmii_common_reset,
+};
+
 static struct sgmii_ops qdf2432_ops = {
 	.init = emac_sgmii_init_qdf2432,
 	.open = emac_sgmii_common_open,

@@ -281,6 +289,7 @@ static int emac_sgmii_common_link_change(struct emac_adapter *adpt, bool linkup)
 	.reset = emac_sgmii_common_reset,
 };
 
+#ifdef CONFIG_ACPI
 static struct sgmii_ops qdf2400_ops = {
 	.init = emac_sgmii_init_qdf2400,
 	.open = emac_sgmii_common_open,

@@ -288,6 +297,7 @@ static int emac_sgmii_common_link_change(struct emac_adapter *adpt, bool linkup)
 	.link_change = emac_sgmii_common_link_change,
 	.reset = emac_sgmii_common_reset,
 };
+#endif
 
 static int emac_sgmii_acpi_match(struct device *dev, void *data)
 {

@@ -335,11 +345,11 @@ static int emac_sgmii_acpi_match(struct device *dev, void *data)
 static const struct of_device_id emac_sgmii_dt_match[] = {
 	{
 		.compatible = "qcom,fsm9900-emac-sgmii",
-		.data = emac_sgmii_init_fsm9900,
+		.data = &fsm9900_ops,
 	},
 	{
 		.compatible = "qcom,qdf2432-emac-sgmii",
-		.data = emac_sgmii_init_qdf2432,
+		.data = &qdf2432_ops,
 	},
 	{}
 };

@@ -386,7 +396,7 @@ int emac_sgmii_config(struct platform_device *pdev, struct emac_adapter *adpt)
 			goto error_put_device;
 		}
 
-		phy->sgmii_ops->init = match->data;
+		phy->sgmii_ops = (struct sgmii_ops *)match->data;
 	}
 
 	/* Base address is the first address */
Signature · 3 lines
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc.  Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
maintainer Applied
#1 lore raw

From: Timur Tabi <[email protected]>
Date: Sat, 26 May 2018 20:29:14 -0500

Quoted 7 lines

Commit "net: qcom/emac: Encapsulate sgmii ops under one structure" introduced the sgmii_ops structure, but did not correctly initialize it on device tree platforms. This resulted in compiler warnings when ACPI is not enabled.

Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Timur Tabi <[email protected]>

Applied to net-next, thank you.