Commit d4d2c58b authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman

virt: vbox: convert to use dev_groups

The driver core supports the ability to handle the creation and removal
of device-specific sysfs files in a race-free manner. Moreover, it can
guarantee the success of creation. Therefore, it should be better to
convert to use dev_groups.

Fixes: 0ba002bc ("virt: Add vboxguest driver for Virtual Box Guest integration")
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220901144610.3550300-1-jiasheng@iscas.ac.cnSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5144241
...@@ -270,6 +270,13 @@ static ssize_t host_features_show(struct device *dev, ...@@ -270,6 +270,13 @@ static ssize_t host_features_show(struct device *dev,
static DEVICE_ATTR_RO(host_version); static DEVICE_ATTR_RO(host_version);
static DEVICE_ATTR_RO(host_features); static DEVICE_ATTR_RO(host_features);
static struct attribute *vbg_pci_attrs[] = {
&dev_attr_host_version.attr,
&dev_attr_host_features.attr,
NULL,
};
ATTRIBUTE_GROUPS(vbg_pci);
/** /**
* Does the PCI detection and init of the device. * Does the PCI detection and init of the device.
* *
...@@ -390,8 +397,6 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) ...@@ -390,8 +397,6 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
} }
pci_set_drvdata(pci, gdev); pci_set_drvdata(pci, gdev);
device_create_file(dev, &dev_attr_host_version);
device_create_file(dev, &dev_attr_host_features);
vbg_info("vboxguest: misc device minor %d, IRQ %d, I/O port %x, MMIO at %pap (size %pap)\n", vbg_info("vboxguest: misc device minor %d, IRQ %d, I/O port %x, MMIO at %pap (size %pap)\n",
gdev->misc_device.minor, pci->irq, gdev->io_port, gdev->misc_device.minor, pci->irq, gdev->io_port,
...@@ -422,8 +427,6 @@ static void vbg_pci_remove(struct pci_dev *pci) ...@@ -422,8 +427,6 @@ static void vbg_pci_remove(struct pci_dev *pci)
mutex_unlock(&vbg_gdev_mutex); mutex_unlock(&vbg_gdev_mutex);
free_irq(pci->irq, gdev); free_irq(pci->irq, gdev);
device_remove_file(gdev->dev, &dev_attr_host_features);
device_remove_file(gdev->dev, &dev_attr_host_version);
misc_deregister(&gdev->misc_device_user); misc_deregister(&gdev->misc_device_user);
misc_deregister(&gdev->misc_device); misc_deregister(&gdev->misc_device);
vbg_core_exit(gdev); vbg_core_exit(gdev);
...@@ -488,6 +491,7 @@ MODULE_DEVICE_TABLE(pci, vbg_pci_ids); ...@@ -488,6 +491,7 @@ MODULE_DEVICE_TABLE(pci, vbg_pci_ids);
static struct pci_driver vbg_pci_driver = { static struct pci_driver vbg_pci_driver = {
.name = DEVICE_NAME, .name = DEVICE_NAME,
.dev_groups = vbg_pci_groups,
.id_table = vbg_pci_ids, .id_table = vbg_pci_ids,
.probe = vbg_pci_probe, .probe = vbg_pci_probe,
.remove = vbg_pci_remove, .remove = vbg_pci_remove,
......
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