diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-23 13:30:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-25 07:13:23 +0200 |
| commit | c5d5f5fdc76baf0b8d074338c94bd443635ef9d0 (patch) | |
| tree | 29ba76558202a1421d4c8e663f8d570f1856d4aa | |
| parent | sfc: Implement message level control (diff) | |
| download | linux-c5d5f5fdc76baf0b8d074338c94bd443635ef9d0.tar.xz linux-c5d5f5fdc76baf0b8d074338c94bd443635ef9d0.zip | |
sfc: Replace EFX_DRIVER_NAME with KBUILD_MODNAME
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/sfc/efx.c | 2 | ||||
| -rw-r--r-- | drivers/net/sfc/ethtool.c | 2 | ||||
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 72514005c2a3..ad359110813b 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -2432,7 +2432,7 @@ static struct dev_pm_ops efx_pm_ops = { }; static struct pci_driver efx_pci_driver = { - .name = EFX_DRIVER_NAME, + .name = KBUILD_MODNAME, .id_table = efx_pci_table, .probe = efx_pci_probe, .remove = efx_pci_remove, diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 27230a992893..53f3eb20f4ea 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c @@ -234,7 +234,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev, { struct efx_nic *efx = netdev_priv(net_dev); - strlcpy(info->driver, EFX_DRIVER_NAME, sizeof(info->driver)); + strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version)); if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) siena_print_fwver(efx, info->fw_version, diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 0cca44b4ee44..9116dc977abb 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -39,9 +39,7 @@ * Build definitions * **************************************************************************/ -#ifndef EFX_DRIVER_NAME -#define EFX_DRIVER_NAME "sfc" -#endif + #define EFX_DRIVER_VERSION "3.0" #ifdef EFX_ENABLE_DEBUG |