Skip to contentSkip to conversation

8390: Miscellaneous cleanups

PATCH In review Armin Wolf 2 participants 2 messages Jul 23, 2020

Subsystems (3)
Networking Network drivers 8390 network drivers
lore
Share & tools
lore

Armin Wolf

author
#0 lore raw

PATCH 1/2 8390: Miscellaneous cleanups

Replace version string with MODULE_* macros.

Include necessary librarys.

Signed-off-by Armin Wolf <[email protected]>
---
 drivers/net/ethernet/8390/8390.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/net/ethernet/8390/8390.c +20 -5
index 0e0aa4016858..aabb637c1fbf 100644
@@ -1,11 +1,26 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* 8390 core for usual drivers */
 
-static const char version[] =
-    "8390.c:v1.10cvs 9/23/94 Donald Becker ([email protected])\n";
+#define DRV_NAME "8390"
+#define DRV_DESCRIPTION "8390 core for usual drivers"
+#define DRV_AUTHOR "Donald Becker ([email protected])"
+#define DRV_VERSION "1.10cvs"
+#define DRV_RELDATE "9/23/1994"
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 
 #include "lib8390.c"
 
+MODULE_AUTHOR(DRV_AUTHOR);
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+
 int ei_open(struct net_device *dev)
 {
 	return __ei_open(dev);

@@ -64,7 +79,7 @@ const struct net_device_ops ei_netdev_ops = {
 	.ndo_get_stats		= ei_get_stats,
 	.ndo_set_rx_mode	= ei_set_multicast_list,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_set_mac_address	= eth_mac_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= ei_poll,
 #endif

@@ -74,6 +89,7 @@ EXPORT_SYMBOL(ei_netdev_ops);
 struct net_device *__alloc_ei_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
+
 	if (dev)
 		dev->netdev_ops = &ei_netdev_ops;
 	return dev;

@@ -100,4 +116,3 @@ static void __exit ns8390_module_exit(void)
 module_init(ns8390_module_init);
 module_exit(ns8390_module_exit);
 #endif /* MODULE */
-MODULE_LICENSE("GPL");

--
2.20.1

maintainer
#1 lore raw

From: Armin Wolf <[email protected]>
Date: Thu, 23 Jul 2020 20:34:46 +0200

Quoted 1 line

Include necessary librarys.

'libraries'

drivers/net/ethernet/8390/8390.c const struct net_device_ops ei_netdev_ops = { · line 82

Quoted 6 lines
drivers/net/ethernet/8390/8390.c +1 -1
@@ -64,7 +79,7 @@ const struct net_device_ops ei_netdev_ops = {
 	.ndo_get_stats		= ei_get_stats,
 	.ndo_set_rx_mode	= ei_set_multicast_list,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_set_mac_address	= eth_mac_addr,

This has nothing to do with your change.

drivers/net/ethernet/8390/8390.c EXPORT_SYMBOL(ei_netdev_ops); · line 92

Quoted 8 lines
drivers/net/ethernet/8390/8390.c +1 -0
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= ei_poll,
 #endif

@@ -74,6 +89,7 @@ EXPORT_SYMBOL(ei_netdev_ops);
 struct net_device *__alloc_ei_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
+

Neither does this.