[PATCH net-next] net: qcom/emac: fix unused variable
When CONFIG_ACPI isn't set, variable qdf2400_ops/qdf2432_ops isn't used.
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c:284:25: warning: ‘qdf2400_ops’
defined but not used [-Wunused-variable]
static struct sgmii_ops qdf2400_ops = {
^~~
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c:276:25: warning: ‘qdf2432_ops’
defined but not used [-Wunused-variable]
static struct sgmii_ops qdf2432_ops = {
^~~
Move the declaration and functions inside the CONFIG_ACPI ifdef
to fix the warning.
Signed-off-by: YueHaibing
---
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
index 562420b..15609cb 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
@@ -108,6 +108,7 @@ static void emac_sgmii_link_init(struct emac_adapter *adpt)
writel(val, phy->base + EMAC_SGMII_PHY_AUTONEG_CFG2);
}
+#ifdef CONFIG_ACPI
static int emac_sgmii_irq_clear(struct emac_adapter *adpt, u8 irq_bits)
{
struct emac_sgmii *phy = >phy;
@@ -291,7 +292,6 @@ static struct sgmii_ops qdf2400_ops = {
static int emac_sgmii_acpi_match(struct device *dev, void *data)
{
-#ifdef CONFIG_ACPI
static const struct acpi_device_id match_table[] = {
{
.id = "QCOM8071",
@@ -327,10 +327,16 @@ static int emac_sgmii_acpi_match(struct device *dev, void
*data)
return 1;
}
}
-#endif
return 0;
}
+#else
+static int emac_sgmii_acpi_match(struct device *dev, void *data)
+{
+ return 0;
+}
+
+#endif
static const struct of_device_id emac_sgmii_dt_match[] = {
{
--
2.7.0
[PATCH net-next] net: qcom/emac: fix unused variable
When CONFIG_ACPI isn't set, variable qdf2400_ops/qdf2432_ops isn't used.
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c:284:25: warning: ‘qdf2400_ops’
defined but not used [-Wunused-variable]
static struct sgmii_ops qdf2400_ops = {
^~~
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c:276:25: warning: ‘qdf2432_ops’
defined but not used [-Wunused-variable]
static struct sgmii_ops qdf2432_ops = {
^~~
Move the declaration and functions inside the CONFIG_ACPI ifdef
to fix the warning.
Signed-off-by: YueHaibing
---
drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
index 562420b..15609cb 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
@@ -108,6 +108,7 @@ static void emac_sgmii_link_init(struct emac_adapter *adpt)
writel(val, phy->base + EMAC_SGMII_PHY_AUTONEG_CFG2);
}
+#ifdef CONFIG_ACPI
static int emac_sgmii_irq_clear(struct emac_adapter *adpt, u8 irq_bits)
{
struct emac_sgmii *phy = >phy;
@@ -291,7 +292,6 @@ static struct sgmii_ops qdf2400_ops = {
static int emac_sgmii_acpi_match(struct device *dev, void *data)
{
-#ifdef CONFIG_ACPI
static const struct acpi_device_id match_table[] = {
{
.id = "QCOM8071",
@@ -327,10 +327,16 @@ static int emac_sgmii_acpi_match(struct device *dev, void
*data)
return 1;
}
}
-#endif
return 0;
}
+#else
+static int emac_sgmii_acpi_match(struct device *dev, void *data)
+{
+ return 0;
+}
+
+#endif
static const struct of_device_id emac_sgmii_dt_match[] = {
{
--
2.7.0
