[PATCH] net: tulip: Rename PCI driver struct to end in _driver

[PATCH] net: tulip: Rename PCI driver struct to end in _driver

[Uwe Kleine-König]

This is not only a cosmetic change because the section mismatch checks
also depend on the name and for drivers the checks are stricter than for
ops.

However xircom_driver also passes the stricter checks just fine, so no
further changes needed.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
---
 drivers/net/ethernet/dec/tulip/xircom_cb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 8759f9f76b62..e5d2ede13845 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -143,7 +143,7 @@ static const struct pci_device_id xircom_pci_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, xircom_pci_table);
 
-static struct pci_driver xircom_ops = {
+static struct pci_driver xircom_driver = {
 	.name		= "xircom_cb",
 	.id_table	= xircom_pci_table,
 	.probe		= xircom_probe,
@@ -1169,4 +1169,4 @@ investigate_write_descriptor(struct net_device *dev,
 	}
 }
 
-module_pci_driver(xircom_ops);
+module_pci_driver(xircom_driver);

base-commit: e04c78d86a9699d136910cfc0bdcf01087e3267e
-- 
2.49.0

Re: [PATCH] net: tulip: Rename PCI driver struct to end in _driver

[Simon Horman]

On Fri, Jun 27, 2025 at 12:22:20PM +0200, Uwe Kleine-König wrote:
> This is not only a cosmetic change because the section mismatch checks
> also depend on the name and for drivers the checks are stricter than for
> ops.
> 
> However xircom_driver also passes the stricter checks just fine, so no
> further changes needed.
> 
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>

As per my comment on a similar patch for a different driver:

From a Networking subsystem point of view
this feels more like an enhancement than a bug fix.
Can we drop the Fixes tag?

...

Re: [PATCH] net: tulip: Rename PCI driver struct to end in _driver

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

On Fri, Jun 27, 2025 at 08:48:26PM +0100, Simon Horman wrote:
> On Fri, Jun 27, 2025 at 12:22:20PM +0200, Uwe Kleine-König wrote:
> > This is not only a cosmetic change because the section mismatch checks
> > also depend on the name and for drivers the checks are stricter than for
> > ops.
> > 
> > However xircom_driver also passes the stricter checks just fine, so no
> > further changes needed.
> > 
> > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
> 
> As per my comment on a similar patch for a different driver:
> 
> From a Networking subsystem point of view
> this feels more like an enhancement than a bug fix.
> Can we drop the Fixes tag?

For completeness: Here the same applies as for said other patch: IMHO
the Fixes: line is right, but I agree that we don't need a backport to
stable and I'm ok with dropping the line.

Best regards
Uwe

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH v2 net-next] net: tulip: Rename PCI driver struct to end in _driver

[Uwe Kleine-König]

This is not only a cosmetic change because the section mismatch checks
(implemented in scripts/mod/modpost.c) also depend on the name and for
drivers the checks are stricter than for ops.

However xircom_driver also passes the stricter checks just fine, so no
further changes needed.

The driver got this wrong for the longer than the kernel is tracked in
git, so commit 1da177e4c3f4 ("Linux-2.6.12-rc2") was already wrong.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
---
changes since implicit v1 (available at
https://lore.kernel.org/netdev/20250627102220.1937649-2-u.kleine-koenig@baylibre.com):

 - Improve commit log to explain in more detail the check
 - Mention the introducing commit in prose and not in a Fixes: line
 - Explicitly mark for net-next in the Subject line

 drivers/net/ethernet/dec/tulip/xircom_cb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 8759f9f76b62..e5d2ede13845 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -143,7 +143,7 @@ static const struct pci_device_id xircom_pci_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, xircom_pci_table);
 
-static struct pci_driver xircom_ops = {
+static struct pci_driver xircom_driver = {
 	.name		= "xircom_cb",
 	.id_table	= xircom_pci_table,
 	.probe		= xircom_probe,
@@ -1169,4 +1169,4 @@ investigate_write_descriptor(struct net_device *dev,
 	}
 }
 
-module_pci_driver(xircom_ops);
+module_pci_driver(xircom_driver);

base-commit: e04c78d86a9699d136910cfc0bdcf01087e3267e
-- 
2.49.0

Re: [PATCH] net: tulip: Rename PCI driver struct to end in _driver

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 27 Jun 2025 12:22:20 +0200 you wrote:
> This is not only a cosmetic change because the section mismatch checks
> also depend on the name and for drivers the checks are stricter than for
> ops.
> 
> However xircom_driver also passes the stricter checks just fine, so no
> further changes needed.
> 
> [...]

Here is the summary with links:
  - net: tulip: Rename PCI driver struct to end in _driver
    https://git.kernel.org/netdev/net-next/c/e96ee511c906

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html