i825xx/ether1.c: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
92a66593e5
commit
663c2a69e9
1 changed files with 7 additions and 7 deletions
|
@ -72,7 +72,7 @@ static void ether1_timeout(struct net_device *dev);
|
|||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
static char version[] __devinitdata = "ether1 ethernet driver (c) 2000 Russell King v1.07\n";
|
||||
static char version[] = "ether1 ethernet driver (c) 2000 Russell King v1.07\n";
|
||||
|
||||
#define BUS_16 16
|
||||
#define BUS_8 8
|
||||
|
@ -250,7 +250,7 @@ ether1_readbuffer (struct net_device *dev, void *data, unsigned int start, unsig
|
|||
} while (thislen);
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
ether1_ramtest(struct net_device *dev, unsigned char byte)
|
||||
{
|
||||
unsigned char *buffer = kmalloc (BUFFER_SIZE, GFP_KERNEL);
|
||||
|
@ -304,7 +304,7 @@ ether1_reset (struct net_device *dev)
|
|||
return BUS_16;
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
ether1_init_2(struct net_device *dev)
|
||||
{
|
||||
int i;
|
||||
|
@ -966,7 +966,7 @@ ether1_setmulticastlist (struct net_device *dev)
|
|||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
static void __devinit ether1_banner(void)
|
||||
static void ether1_banner(void)
|
||||
{
|
||||
static unsigned int version_printed = 0;
|
||||
|
||||
|
@ -985,7 +985,7 @@ static const struct net_device_ops ether1_netdev_ops = {
|
|||
.ndo_set_mac_address = eth_mac_addr,
|
||||
};
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
{
|
||||
struct net_device *dev;
|
||||
|
@ -1046,7 +1046,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void __devexit ether1_remove(struct expansion_card *ec)
|
||||
static void ether1_remove(struct expansion_card *ec)
|
||||
{
|
||||
struct net_device *dev = ecard_get_drvdata(ec);
|
||||
|
||||
|
@ -1064,7 +1064,7 @@ static const struct ecard_id ether1_ids[] = {
|
|||
|
||||
static struct ecard_driver ether1_driver = {
|
||||
.probe = ether1_probe,
|
||||
.remove = __devexit_p(ether1_remove),
|
||||
.remove = ether1_remove,
|
||||
.id_table = ether1_ids,
|
||||
.drv = {
|
||||
.name = "ether1",
|
||||
|
|
Loading…
Reference in a new issue