Skip to content

W
wr-switch-sw
Commit ce1b7bef authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

wr_nic: get rid of DRV_NAME 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 6891c044
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
kernel/wr_nic/device.c
View file @ ce1b7bef
......@@ -25,7 +25,7 @@
#include "nic-mem.h"
/* The remove function is used by probe, so it's not __devexit */
static int __devexit wrn_remove(struct platform_device *pdev)
static int wrn_remove(struct platform_device *pdev)
{
struct wrn_dev *wrn = pdev->dev.platform_data;
int i;
......@@ -211,7 +211,7 @@ struct platform_driver wrn_driver = {
.remove = wrn_remove, /* not __exit_p as probe calls it */
/* No suspend or resume by now */
.driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
},
};
kernel/wr_nic/endpoint.c
View file @ ce1b7bef
......@@ -242,7 +242,7 @@ int wrn_endpoint_probe(struct net_device *dev)
/* Check whether the ep has been sinthetized or not */
val = readl(&ep->ep_regs->IDCODE);
if (val != WRN_EP_MAGIC) {
pr_info(DRV_NAME "EP%i (%s) has not been sintethized\n",
pr_info(KBUILD_MODNAME " EP%i (%s) has not been sintethized\n",
ep->ep_number, dev->name);
return -ENODEV;
}
......@@ -285,7 +285,7 @@ int wrn_endpoint_probe(struct net_device *dev)
put_unaligned_be32(val + 1, wraddr + 2);
if (err) {
printk(KERN_ERR DRV_NAME "Can't register dev %s\n",
printk(KERN_ERR KBUILD_MODNAME ": Can't register dev %s\n",
dev->name);
__wrn_endpoint_shutdown(ep);
/* ENODEV means "no more" for the caller, so avoid it */
......
kernel/wr_nic/ethtool.c
View file @ ce1b7bef
......@@ -70,7 +70,7 @@ static int wrn_nwayreset(struct net_device *dev)
static void wrn_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
strlcpy(info->bus_info, dev_name(dev->dev.parent),
sizeof(info->bus_info));
......
kernel/wr_nic/module.c
View file @ ce1b7bef
......@@ -45,7 +45,7 @@ static void wrn_release(struct device *dev)
}
static struct platform_device wrn_device = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id = 0,
.resource = wrn_resources,
.num_resources = ARRAY_SIZE(wrn_resources),
......
kernel/wr_nic/wr-nic.h
View file @ ce1b7bef
......@@ -46,7 +46,6 @@
#include "nic-hardware.h" /* Magic numbers: please fix them as needed */
#define DRV_NAME "wr-nic" /* Used in messages and device/driver names */
#define DRV_VERSION "0.1" /* For ethtool->get_drvinfo -- FIXME: auto-vers */
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment