Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5d5f5fd authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Replace EFX_DRIVER_NAME with KBUILD_MODNAME 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62776d03

drivers/net/sfc/efx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2432,7 +2432,7 @@ static struct dev_pm_ops efx_pm_ops = { 
};

};





static struct pci_driver efx_pci_driver = {

static struct pci_driver efx_pci_driver = {

	.name		= EFX_DRIVER_NAME,

	.name		= KBUILD_MODNAME,

	.id_table	= efx_pci_table,

	.id_table	= efx_pci_table,

	.probe		= efx_pci_probe,

	.probe		= efx_pci_probe,

	.remove		= efx_pci_remove,

	.remove		= efx_pci_remove,

drivers/net/sfc/ethtool.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev, 
{

{

	struct efx_nic *efx = netdev_priv(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));

	strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));

	if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)

	if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)

		siena_print_fwver(efx, info->fw_version,

		siena_print_fwver(efx, info->fw_version,

drivers/net/sfc/net_driver.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -39,9 +39,7 @@ 
 * Build definitions

 * Build definitions

 *

 *

 **************************************************************************/

 **************************************************************************/

#ifndef EFX_DRIVER_NAME



#define EFX_DRIVER_NAME	"sfc"

#endif

#define EFX_DRIVER_VERSION	"3.0"

#define EFX_DRIVER_VERSION	"3.0"





#ifdef EFX_ENABLE_DEBUG

#ifdef EFX_ENABLE_DEBUG