From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>, Andrew Lunn <andrew@lunn.ch>,
Arnd Bergmann <arnd@arndb.de>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>, Lukas Wunner <lukas@wunner.de>
Subject: [PATCH net-next V2] net: ks8851: Fix mixed module/builtin build
Date: Sat, 16 Jan 2021 17:48:28 +0100 [thread overview]
Message-ID: <20210116164828.40545-1-marex@denx.de> (raw)
When either the SPI or PAR variant is compiled as module AND the other
variant is compiled as built-in, the following build error occurs:
arm-linux-gnueabi-ld: drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common':
ks8851_common.c:(.text+0x1564): undefined reference to `__this_module'
Fix this by passing THIS_MODULE as argument to ks8851_probe_common(),
ks8851_register_mdiobus(), and ultimately __mdiobus_register() in the
ks8851_common.c.
Fixes: ef3631220d2b ("net: ks8851: Register MDIO bus and the internal PHY")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Lukas Wunner <lukas@wunner.de>
---
V2: Pass the THIS_MODULE into ks8851_common.c
---
drivers/net/ethernet/micrel/ks8851.h | 2 +-
drivers/net/ethernet/micrel/ks8851_common.c | 9 +++++----
drivers/net/ethernet/micrel/ks8851_par.c | 2 +-
drivers/net/ethernet/micrel/ks8851_spi.c | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
index ef13929036cf..037138fc6cb4 100644
--- a/drivers/net/ethernet/micrel/ks8851.h
+++ b/drivers/net/ethernet/micrel/ks8851.h
@@ -428,7 +428,7 @@ struct ks8851_net {
};
int ks8851_probe_common(struct net_device *netdev, struct device *dev,
- int msg_en);
+ int msg_en, struct module *owner);
int ks8851_remove_common(struct device *dev);
int ks8851_suspend(struct device *dev);
int ks8851_resume(struct device *dev);
diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c
index f1996787bba5..88303ba4869d 100644
--- a/drivers/net/ethernet/micrel/ks8851_common.c
+++ b/drivers/net/ethernet/micrel/ks8851_common.c
@@ -1104,7 +1104,8 @@ int ks8851_resume(struct device *dev)
}
#endif
-static int ks8851_register_mdiobus(struct ks8851_net *ks, struct device *dev)
+static int ks8851_register_mdiobus(struct ks8851_net *ks, struct device *dev,
+ struct module *owner)
{
struct phy_device *phy_dev;
struct mii_bus *mii_bus;
@@ -1122,7 +1123,7 @@ static int ks8851_register_mdiobus(struct ks8851_net *ks, struct device *dev)
mii_bus->phy_mask = ~((u32)BIT(0));
snprintf(mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev));
- ret = mdiobus_register(mii_bus);
+ ret = __mdiobus_register(mii_bus, owner);
if (ret)
goto err_mdiobus_register;
@@ -1149,7 +1150,7 @@ static void ks8851_unregister_mdiobus(struct ks8851_net *ks)
}
int ks8851_probe_common(struct net_device *netdev, struct device *dev,
- int msg_en)
+ int msg_en, struct module *owner)
{
struct ks8851_net *ks = netdev_priv(netdev);
unsigned cider;
@@ -1224,7 +1225,7 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev,
dev_info(dev, "message enable is %d\n", msg_en);
- ret = ks8851_register_mdiobus(ks, dev);
+ ret = ks8851_register_mdiobus(ks, dev, owner);
if (ret)
goto err_mdio;
diff --git a/drivers/net/ethernet/micrel/ks8851_par.c b/drivers/net/ethernet/micrel/ks8851_par.c
index 3bab0cb2b1a5..d6fc53d3efbb 100644
--- a/drivers/net/ethernet/micrel/ks8851_par.c
+++ b/drivers/net/ethernet/micrel/ks8851_par.c
@@ -324,7 +324,7 @@ static int ks8851_probe_par(struct platform_device *pdev)
netdev->irq = platform_get_irq(pdev, 0);
- return ks8851_probe_common(netdev, dev, msg_enable);
+ return ks8851_probe_common(netdev, dev, msg_enable, THIS_MODULE);
}
static int ks8851_remove_par(struct platform_device *pdev)
diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
index 4ec7f1615977..9fbb7a548580 100644
--- a/drivers/net/ethernet/micrel/ks8851_spi.c
+++ b/drivers/net/ethernet/micrel/ks8851_spi.c
@@ -451,7 +451,7 @@ static int ks8851_probe_spi(struct spi_device *spi)
netdev->irq = spi->irq;
- return ks8851_probe_common(netdev, dev, msg_enable);
+ return ks8851_probe_common(netdev, dev, msg_enable, THIS_MODULE);
}
static int ks8851_remove_spi(struct spi_device *spi)
--
2.29.2
next reply other threads:[~2021-01-16 17:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 16:48 Marek Vasut [this message]
2021-01-16 17:04 ` [PATCH net-next V2] net: ks8851: Fix mixed module/builtin build Arnd Bergmann
2021-01-16 17:54 ` Marek Vasut
2021-01-16 19:26 ` Arnd Bergmann
2021-01-16 20:39 ` Lukas Wunner
2021-01-16 21:25 ` Marek Vasut
2021-01-16 21:41 ` Heiner Kallweit
2021-01-17 10:21 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210116164828.40545-1-marex@denx.de \
--to=marex@denx.de \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox