From: Andrey Panin <pazke@orbita.don.sitek.net>
To: linux-kernel@vger.kernel.org
Cc: kernel-janitor-discuss@lists.sourceforge.net
Subject: [PATCH] net drivers: missing __init's
Date: Mon, 9 Apr 2001 16:11:52 +0400 [thread overview]
Message-ID: <20010409161152.B3723@debian> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 369 bytes --]
Hi all,
attached patches add missing __init and (__devinit) to some network drivers:
at1700.c, eepro.c, epic100.c, hamachi.c, sis900.c,
tokenring/abyss.c, tokenring/tmsisa.c, tokenring/tmspci.c.
Best regards.
--
Andrey Panin | Embedded systems software engineer
pazke@orbita1.ru | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin.asc
[-- Attachment #1.2: patch-at1700 --]
[-- Type: text/plain, Size: 457 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/at1700.c /linux/drivers/net/at1700.c
--- /linux.vanilla/drivers/net/at1700.c Mon Apr 2 15:45:18 2001
+++ /linux/drivers/net/at1700.c Sat Apr 7 21:22:27 2001
@@ -470,7 +470,7 @@
#define EE_READ_CMD (6 << 6)
#define EE_ERASE_CMD (7 << 6)
-static int read_eeprom(int ioaddr, int location)
+static int __init read_eeprom(int ioaddr, int location)
{
int i;
unsigned short retval = 0;
[-- Attachment #1.3: patch-eepro --]
[-- Type: text/plain, Size: 812 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/eepro.c /linux/drivers/net/eepro.c
--- /linux.vanilla/drivers/net/eepro.c Mon Apr 2 15:45:19 2001
+++ /linux/drivers/net/eepro.c Sun Apr 8 23:51:12 2001
@@ -588,7 +588,7 @@
return -ENODEV;
}
-static void printEEPROMInfo(short ioaddr, struct net_device *dev)
+static void __init printEEPROMInfo(short ioaddr, struct net_device *dev)
{
unsigned short Word;
int i,j;
@@ -647,7 +647,7 @@
probes on the ISA bus. A good device probe avoids doing writes, and
verifies that the correct device exists and functions. */
-static int eepro_probe1(struct net_device *dev, short ioaddr)
+static int __init eepro_probe1(struct net_device *dev, short ioaddr)
{
unsigned short station_addr[6], id, counter;
int i,j, irqMask;
[-- Attachment #1.4: patch-epic100 --]
[-- Type: text/plain, Size: 457 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/epic100.c /linux/drivers/net/epic100.c
--- /linux.vanilla/drivers/net/epic100.c Mon Apr 2 15:45:27 2001
+++ /linux/drivers/net/epic100.c Sun Apr 8 23:46:03 2001
@@ -545,7 +545,7 @@
#define EE_READ256_CMD (6 << 8)
#define EE_ERASE_CMD (7 << 6)
-static int read_eeprom(long ioaddr, int location)
+static int __devinit read_eeprom(long ioaddr, int location)
{
int i;
int retval = 0;
[-- Attachment #1.5: patch-hamachi --]
[-- Type: text/plain, Size: 944 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/hamachi.c /linux/drivers/net/hamachi.c
--- /linux.vanilla/drivers/net/hamachi.c Mon Apr 2 15:45:33 2001
+++ /linux/drivers/net/hamachi.c Sun Apr 8 23:48:24 2001
@@ -545,7 +544,7 @@
static void set_rx_mode(struct net_device *dev);
-static int __init hamachi_init_one (struct pci_dev *pdev,
+static int __devinit hamachi_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
static int did_version = 0; /* Already printed version info. */
@@ -728,7 +727,7 @@
return 0;
}
-static int read_eeprom(long ioaddr, int location)
+static int __devinit read_eeprom(long ioaddr, int location)
{
int bogus_cnt = 1000;
@@ -1858,7 +1857,7 @@
}
-static void __exit hamachi_remove_one (struct pci_dev *pdev)
+static void __devexit hamachi_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
[-- Attachment #1.6: patch-sis900 --]
[-- Type: text/plain, Size: 640 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/sis900.c /linux/drivers/net/sis900.c
--- /linux.vanilla/drivers/net/sis900.c Mon Apr 2 15:45:26 2001
+++ /linux/drivers/net/sis900.c Sun Apr 8 18:15:42 2001
@@ -60,7 +60,7 @@
#include "sis900.h"
-static const char *version =
+static const char *version __initdata =
"sis900.c: v1.07.09 2/9/2001\n";
static int max_interrupt_work = 20;
@@ -443,7 +443,7 @@
* Note that location is in word (16 bits) unit
*/
-static u16 read_eeprom(long ioaddr, int location)
+static u16 __devinit read_eeprom(long ioaddr, int location)
{
int i;
u16 retval = 0;
[-- Attachment #1.7: patch-abyss --]
[-- Type: text/plain, Size: 512 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/tokenring/abyss.c /linux/drivers/net/tokenring/abyss.c
--- /linux.vanilla/drivers/net/tokenring/abyss.c Mon Apr 2 15:45:22 2001
+++ /linux/drivers/net/tokenring/abyss.c Sat Apr 7 21:58:20 2001
@@ -390,7 +390,7 @@
* Read configuration data from the AT24 SEEPROM on Madge cards.
*
*/
-static void abyss_read_eeprom(struct net_device *dev)
+static void __init abyss_read_eeprom(struct net_device *dev)
{
struct net_local *tp;
unsigned long ioaddr;
[-- Attachment #1.8: patch-tmsisa --]
[-- Type: text/plain, Size: 857 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/tokenring/tmsisa.c /linux/drivers/net/tokenring/tmsisa.c
--- /linux.vanilla/drivers/net/tokenring/tmsisa.c Mon Apr 2 15:45:22 2001
+++ /linux/drivers/net/tokenring/tmsisa.c Sun Apr 8 18:18:51 2001
@@ -19,7 +19,7 @@
* TODO:
* 1. Add support for Proteon TR ISA adapters (1392, 1392+)
*/
-static const char *version = "tmsisa.c: v1.00 14/01/2001 by Jochen Friedrich\n";
+static const char version[] __initdata = "tmsisa.c: v1.00 14/01/2001 by Jochen Friedrich\n";
#include <linux/module.h>
#include <linux/kernel.h>
@@ -297,7 +297,7 @@
* machine hard when this is called. Luckily, its supported in a
* seperate driver. --ASF
*/
-static void tms_isa_read_eeprom(struct net_device *dev)
+static void __init tms_isa_read_eeprom(struct net_device *dev)
{
int i;
[-- Attachment #1.9: patch-tmspci --]
[-- Type: text/plain, Size: 1053 bytes --]
diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/tokenring/tmspci.c /linux/drivers/net/tokenring/tmspci.c
--- /linux.vanilla/drivers/net/tokenring/tmspci.c Mon Apr 2 15:45:22 2001
+++ /linux/drivers/net/tokenring/tmspci.c Sat Apr 7 22:04:33 2001
@@ -90,7 +90,7 @@
outw(val, dev->base_addr + reg);
}
-static int __init tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
{
static int versionprinted;
struct net_device *dev;
@@ -192,7 +192,7 @@
* machine hard when this is called. Luckily, its supported in a
* seperate driver. --ASF
*/
-static void tms_pci_read_eeprom(struct net_device *dev)
+static void __devinit tms_pci_read_eeprom(struct net_device *dev)
{
int i;
@@ -219,7 +219,7 @@
return val;
}
-static void __exit tms_pci_detach (struct pci_dev *pdev)
+static void __devexit tms_pci_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]
next reply other threads:[~2001-04-09 12:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-04-09 12:11 Andrey Panin [this message]
2001-04-09 12:29 ` [PATCH] net drivers: missing __init's Andrzej Krzysztofowicz
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=20010409161152.B3723@debian \
--to=pazke@orbita.don.sitek.net \
--cc=kernel-janitor-discuss@lists.sourceforge.net \
--cc=linux-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.