PCI: Use is_visible() with boot_vga attribute for pci_dev (625e1d59) · Commits · 戴 / test

drivers/pci/pci-sysfs.c

+10 −11

Original line number	Diff line number	Diff line
		@@ -1303,29 +1303,20 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
		pdev->rom_attr = attr;
		}

		if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
		retval = device_create_file(&pdev->dev, &vga_attr);
		if (retval)
		goto err_rom_file;
		}

		/* add platform-specific attributes */
		retval = pcibios_add_platform_entries(pdev);
		if (retval)
		goto err_vga_file;
		goto err_rom_file;

		/* add sysfs entries for various capabilities */
		retval = pci_create_capabilities_sysfs(pdev);
		if (retval)
		goto err_vga_file;
		goto err_rom_file;

		pci_create_firmware_label_files(pdev);

		return 0;

		err_vga_file:
		if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
		device_remove_file(&pdev->dev, &vga_attr);
		err_rom_file:
		if (rom_size) {
		sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
		@@ -1413,12 +1404,20 @@ static int __init pci_sysfs_init(void)
		late_initcall(pci_sysfs_init);

		static struct attribute *pci_dev_dev_attrs[] = {
		&vga_attr.attr,
		NULL,
		};

		static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,
		struct attribute *a, int n)
		{
		struct device *dev = container_of(kobj, struct device, kobj);
		struct pci_dev *pdev = to_pci_dev(dev);

		if (a == &vga_attr.attr)
		if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
		return 0;

		return a->mode;
		}