mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-13 09:20:17 +00:00
gve: unify driver name usage
Current codebase contained the usage of two different names for this driver (i.e., `gvnic` and `gve`), which is quite unfriendly for users to use, especially when trying to bind or unbind the driver manually. The corresponding kernel module is registered with the name of `gve`. It's more reasonable to align the name of the driver with the module. Fixes: 893ce44df565 ("gve: Add basic driver framework for Compute Engine Virtual NIC") Cc: csully@google.com Signed-off-by: Junfeng Guo <junfeng.guo@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
989b52cdc8
commit
9d0aba9831
@ -964,5 +964,6 @@ void gve_handle_report_stats(struct gve_priv *priv);
|
||||
/* exported by ethtool.c */
|
||||
extern const struct ethtool_ops gve_ethtool_ops;
|
||||
/* needed by ethtool */
|
||||
extern char gve_driver_name[];
|
||||
extern const char gve_version_str[];
|
||||
#endif /* _GVE_H_ */
|
||||
|
@ -15,7 +15,7 @@ static void gve_get_drvinfo(struct net_device *netdev,
|
||||
{
|
||||
struct gve_priv *priv = netdev_priv(netdev);
|
||||
|
||||
strscpy(info->driver, "gve", sizeof(info->driver));
|
||||
strscpy(info->driver, gve_driver_name, sizeof(info->driver));
|
||||
strscpy(info->version, gve_version_str, sizeof(info->version));
|
||||
strscpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
|
||||
}
|
||||
|
@ -33,6 +33,7 @@
|
||||
#define MIN_TX_TIMEOUT_GAP (1000 * 10)
|
||||
#define DQO_TX_MAX 0x3FFFF
|
||||
|
||||
char gve_driver_name[] = "gve";
|
||||
const char gve_version_str[] = GVE_VERSION;
|
||||
static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
|
||||
|
||||
@ -2200,7 +2201,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = pci_request_regions(pdev, "gvnic-cfg");
|
||||
err = pci_request_regions(pdev, gve_driver_name);
|
||||
if (err)
|
||||
goto abort_with_enabled;
|
||||
|
||||
@ -2393,8 +2394,8 @@ static const struct pci_device_id gve_id_table[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct pci_driver gvnic_driver = {
|
||||
.name = "gvnic",
|
||||
static struct pci_driver gve_driver = {
|
||||
.name = gve_driver_name,
|
||||
.id_table = gve_id_table,
|
||||
.probe = gve_probe,
|
||||
.remove = gve_remove,
|
||||
@ -2405,10 +2406,10 @@ static struct pci_driver gvnic_driver = {
|
||||
#endif
|
||||
};
|
||||
|
||||
module_pci_driver(gvnic_driver);
|
||||
module_pci_driver(gve_driver);
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, gve_id_table);
|
||||
MODULE_AUTHOR("Google, Inc.");
|
||||
MODULE_DESCRIPTION("gVNIC Driver");
|
||||
MODULE_DESCRIPTION("Google Virtual NIC Driver");
|
||||
MODULE_LICENSE("Dual MIT/GPL");
|
||||
MODULE_VERSION(GVE_VERSION);
|
||||
|
Loading…
x
Reference in New Issue
Block a user