Removed SET_MODULE_OWNER() macros for Kernel 2.6.24 and newer.

Reference:
[NET]: Nuke SET_MODULE_OWNER macro.

It's been a useless no-op for long enough in 2.6 so I figured it's time to
remove it.  The number of people that could object because they're
maintaining unified 2.4 and 2.6 drivers is probably rather small.

[ Handled drivers added by netdev tree and some missed IRDA cases... -DaveM ]

http://git.kernel.org/?p=linux/kernel/git/davem/net-2.6.24.git;a=commit;h=d19ef7a45e8f177e27fe8b085a68f0f3d68c7a05

git-svn-id: svn://svn.berlios.de//socketcan/trunk@462 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/i82527/i82527.c b/kernel/2.6/drivers/net/can/i82527/i82527.c
index cfc2c9a7bdb96f24be99dc8da251112a676ba600..0b1118e55bf6bccfd8151f23b9af224fdb5f8f76 100644 (file)
--- a/kernel/2.6/drivers/net/can/i82527/i82527.c
+++ b/kernel/2.6/drivers/net/can/i82527/i82527.c
@@ -1081,7 +1081,9 @@ void can_netdev_setup(struct net_device *dev)
        dev->tx_timeout                 = can_tx_timeout;
        dev->watchdog_timeo             = TX_TIMEOUT;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        SET_MODULE_OWNER(dev);
+#endif
 }
 
 static struct net_device* can_create_netdev(int dev_num, int hw_regs)

diff --git a/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c b/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
index f98d41777e2335853ff5babbf1a2aa6da532738e..3c8a1d5b0062d753b924572a650c87e2ce706620 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
+++ b/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
@@ -77,7 +77,9 @@ static int __devinit mpc52xx_can_probe(struct platform_device *pdev)
        }
 
        SET_NETDEV_DEV(dev, &pdev->dev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        SET_MODULE_OWNER(THIS_MODULE);
+#endif
 
        dev->base_addr = (unsigned long)ioremap_nocache(mem->start, mem_size);
 

diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.c b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
index 621644472b28a5f25bd91faa65985af9c34124ed..3680aa226a64e789cbcecd5033c32cd26433b33a 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.c
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
@@ -1037,7 +1037,9 @@ void can_netdev_setup(struct net_device *dev)
        dev->tx_timeout                 = can_tx_timeout;
        dev->watchdog_timeo             = TX_TIMEOUT;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        SET_MODULE_OWNER(dev);
+#endif
 }
 
 static struct net_device* can_create_netdev(int dev_num, int hw_regs)

diff --git a/kernel/2.6/drivers/net/can/slcan.c b/kernel/2.6/drivers/net/can/slcan.c
index 1800182bbb18c571d9a88aa66d0f8fe72530f7d6..2a633d2389318afd5d1d6356e9d1da8dd605034e 100644 (file)
--- a/kernel/2.6/drivers/net/can/slcan.c
+++ b/kernel/2.6/drivers/net/can/slcan.c
@@ -484,7 +484,9 @@ static void slc_setup(struct net_device *dev)
        dev->addr_len           = 0;
        dev->tx_queue_len       = 10;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        SET_MODULE_OWNER(dev);
+#endif
 
        dev->mtu                = sizeof(struct can_frame);
        dev->type               = ARPHRD_CAN;

diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c
index fa0117df6111f279b1bf8f5a74510d6e1589a3a5..b80be3ac1568407009804a7a3ab0ca628dad78c6 100644 (file)
--- a/kernel/2.6/drivers/net/can/vcan.c
+++ b/kernel/2.6/drivers/net/can/vcan.c
@@ -247,7 +247,9 @@ static void vcan_setup(struct net_device *dev)
        dev->get_stats         = vcan_get_stats;
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        SET_MODULE_OWNER(dev);
+#endif
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)