[PATCH 2.6.9-rc4 1/2] typhoon: use module_param

[PATCH 2.6.9-rc4 1/2] typhoon: use module_param

[Stephen Hemminger]

Use module_param

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
--- a/drivers/net/via-rhine.c	2004-10-15 12:27:28 -07:00
+++ b/drivers/net/via-rhine.c	2004-10-15 12:27:28 -07:00
@@ -177,6 +177,7 @@
 #define PKT_BUF_SZ	1536	/* Size of each temporary Rx buffer.*/
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -226,9 +227,9 @@
 MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(max_interrupt_work, "i");
-MODULE_PARM(debug, "i");
-MODULE_PARM(rx_copybreak, "i");
+module_param(max_interrupt_work, int, 0);
+module_param(debug, int, 0);
+module_param(rx_copybreak, int, 0);
 MODULE_PARM_DESC(max_interrupt_work, "VIA Rhine maximum events handled per interrupt");
 MODULE_PARM_DESC(debug, "VIA Rhine debug level (0-7)");
 MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames");
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/15 12:46:45-07:00 shemminger@zqx3.pdx.osdl.net 
#   use module_param
# 
# drivers/net/typhoon.c
#   2004/10/15 12:46:34-07:00 shemminger@zqx3.pdx.osdl.net +2 -1
#   use module_param
# 
diff -Nru a/drivers/net/typhoon.c b/drivers/net/typhoon.c
--- a/drivers/net/typhoon.c	2004-10-15 12:46:59 -07:00
+++ b/drivers/net/typhoon.c	2004-10-15 12:46:59 -07:00
@@ -99,6 +99,7 @@
 #define ERR_PFX			KERN_ERR PFX
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -132,7 +133,7 @@
 MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
-MODULE_PARM(rx_copybreak, "i");
+module_param(rx_copybreak, int, 0);
 
 #if defined(NETIF_F_TSO) && MAX_SKB_FRAGS > 32
 #warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO

Re: [PATCH 2.6.9-rc4 1/2] typhoon: use module_param

[Jeff Garzik]

looks like the via-rhine patch got sucked into this one.

can you retransmit -just- the typhoon module_param patch, it looks like 
somebody else already got to netdev_priv in typhoon.

	Jeff

Re: [PATCH 2.6.9-rc4 1/2] typhoon: use module_param

[Stephen Hemminger]

Here is the diff between my current and your netdev tree.

--- netdev-2.6/drivers/net/typhoon.c	2004-09-22 14:39:42.000000000 -0700
+++ tcp-2.6/drivers/net/typhoon.c	2004-10-18 12:59:51.000000000 -0700
@@ -99,6 +99,7 @@
 #define ERR_PFX			KERN_ERR PFX
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -132,7 +133,7 @@
 MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
-MODULE_PARM(rx_copybreak, "i");
+module_param(rx_copybreak, int, 0);
 
 #if defined(NETIF_F_TSO) && MAX_SKB_FRAGS > 32
 #warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO
@@ -1777,7 +1778,7 @@
 typhoon_interrupt(int irq, void *dev_instance, struct pt_regs *rgs)
 {
 	struct net_device *dev = (struct net_device *) dev_instance;
-	struct typhoon *tp = dev->priv;
+	struct typhoon *tp = netdev_priv(dev);
 	void __iomem *ioaddr = tp->ioaddr;
 	u32 intr_status;