Skip to content

Commit 9d0aba9

Browse files
junfenggdavem330
authored andcommitted
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: 893ce44 ("gve: Add basic driver framework for Compute Engine Virtual NIC") Cc: [email protected] Signed-off-by: Junfeng Guo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 989b52c commit 9d0aba9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

drivers/net/ethernet/google/gve/gve.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,5 +964,6 @@ void gve_handle_report_stats(struct gve_priv *priv);
964964
/* exported by ethtool.c */
965965
extern const struct ethtool_ops gve_ethtool_ops;
966966
/* needed by ethtool */
967+
extern char gve_driver_name[];
967968
extern const char gve_version_str[];
968969
#endif /* _GVE_H_ */

drivers/net/ethernet/google/gve/gve_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static void gve_get_drvinfo(struct net_device *netdev,
1515
{
1616
struct gve_priv *priv = netdev_priv(netdev);
1717

18-
strscpy(info->driver, "gve", sizeof(info->driver));
18+
strscpy(info->driver, gve_driver_name, sizeof(info->driver));
1919
strscpy(info->version, gve_version_str, sizeof(info->version));
2020
strscpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
2121
}

drivers/net/ethernet/google/gve/gve_main.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#define MIN_TX_TIMEOUT_GAP (1000 * 10)
3434
#define DQO_TX_MAX 0x3FFFF
3535

36+
char gve_driver_name[] = "gve";
3637
const char gve_version_str[] = GVE_VERSION;
3738
static const char gve_version_prefix[] = GVE_VERSION_PREFIX;
3839

@@ -2200,7 +2201,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
22002201
if (err)
22012202
return err;
22022203

2203-
err = pci_request_regions(pdev, "gvnic-cfg");
2204+
err = pci_request_regions(pdev, gve_driver_name);
22042205
if (err)
22052206
goto abort_with_enabled;
22062207

@@ -2393,8 +2394,8 @@ static const struct pci_device_id gve_id_table[] = {
23932394
{ }
23942395
};
23952396

2396-
static struct pci_driver gvnic_driver = {
2397-
.name = "gvnic",
2397+
static struct pci_driver gve_driver = {
2398+
.name = gve_driver_name,
23982399
.id_table = gve_id_table,
23992400
.probe = gve_probe,
24002401
.remove = gve_remove,
@@ -2405,10 +2406,10 @@ static struct pci_driver gvnic_driver = {
24052406
#endif
24062407
};
24072408

2408-
module_pci_driver(gvnic_driver);
2409+
module_pci_driver(gve_driver);
24092410

24102411
MODULE_DEVICE_TABLE(pci, gve_id_table);
24112412
MODULE_AUTHOR("Google, Inc.");
2412-
MODULE_DESCRIPTION("gVNIC Driver");
2413+
MODULE_DESCRIPTION("Google Virtual NIC Driver");
24132414
MODULE_LICENSE("Dual MIT/GPL");
24142415
MODULE_VERSION(GVE_VERSION);

0 commit comments

Comments
 (0)