Skip to content

Commit

Permalink
seeq: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent f1e2426 commit 5911ce0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions drivers/net/ethernet/seeq/ether3.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
#include <asm/ecard.h>
#include <asm/io.h>

static char version[] __devinitdata = "ether3 ethernet driver (c) 1995-2000 R.M.King v1.17\n";
static char version[] = "ether3 ethernet driver (c) 1995-2000 R.M.King v1.17\n";

#include "ether3.h"

Expand Down Expand Up @@ -194,7 +194,7 @@ static inline void ether3_ledon(struct net_device *dev)
* Read the ethernet address string from the on board rom.
* This is an ascii string!!!
*/
static int __devinit
static int
ether3_addr(char *addr, struct expansion_card *ec)
{
struct in_chunk_dir cd;
Expand All @@ -219,7 +219,7 @@ ether3_addr(char *addr, struct expansion_card *ec)

/* --------------------------------------------------------------------------- */

static int __devinit
static int
ether3_ramtest(struct net_device *dev, unsigned char byte)
{
unsigned char *buffer = kmalloc(RX_END, GFP_KERNEL);
Expand Down Expand Up @@ -268,7 +268,7 @@ ether3_ramtest(struct net_device *dev, unsigned char byte)

/* ------------------------------------------------------------------------------- */

static int __devinit ether3_init_2(struct net_device *dev)
static int ether3_init_2(struct net_device *dev)
{
int i;

Expand Down Expand Up @@ -742,7 +742,7 @@ static void ether3_tx(struct net_device *dev)
}
}

static void __devinit ether3_banner(void)
static void ether3_banner(void)
{
static unsigned version_printed = 0;

Expand All @@ -761,7 +761,7 @@ static const struct net_device_ops ether3_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr,
};

static int __devinit
static int
ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
{
const struct ether3_data *data = id->data;
Expand Down Expand Up @@ -858,7 +858,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
return ret;
}

static void __devexit ether3_remove(struct expansion_card *ec)
static void ether3_remove(struct expansion_card *ec)
{
struct net_device *dev = ecard_get_drvdata(ec);

Expand Down Expand Up @@ -888,7 +888,7 @@ static const struct ecard_id ether3_ids[] = {

static struct ecard_driver ether3_driver = {
.probe = ether3_probe,
.remove = __devexit_p(ether3_remove),
.remove = ether3_remove,
.id_table = ether3_ids,
.drv = {
.name = "ether3",
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/seeq/sgiseeq.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ static const struct net_device_ops sgiseeq_netdev_ops = {
.ndo_validate_addr = eth_validate_addr,
};

static int __devinit sgiseeq_probe(struct platform_device *pdev)
static int sgiseeq_probe(struct platform_device *pdev)
{
struct sgiseeq_platform_data *pd = pdev->dev.platform_data;
struct hpc3_regs *hpcregs = pd->hpc;
Expand Down

0 comments on commit 5911ce0

Please sign in to comment.