diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:23 -0500 |
| commit | bac66f8f9751b432773b48b7c6baf92b036adaae (patch) | |
| tree | bd04f948fb74c61c93ba37e1ccee4979e4377d81 /include | |
| parent | Merge branch 'pci/vpd' (diff) | |
| parent | PCI/sysfs: Use sysfs_emit() and sysfs_emit_at() in "show" functions (diff) | |
| download | linux-dev-bac66f8f9751b432773b48b7c6baf92b036adaae.tar.xz linux-dev-bac66f8f9751b432773b48b7c6baf92b036adaae.zip | |
Merge branch 'pci/sysfs'
- Convert sysfs "config", "rom", "reset", "label", "index", "acpi_index" to
static attributes to fix races in device enumeration (Krzysztof
Wilczyński)
- Convert sysfs "vpd" to static attribute (Heiner Kallweit, Krzysztof
Wilczyński)
- Use sysfs_emit() in "show" functions (Krzysztof Wilczyński)
* pci/sysfs:
PCI/sysfs: Use sysfs_emit() and sysfs_emit_at() in "show" functions
PCI/sysfs: Rearrange smbios_attr_group and acpi_attr_group
PCI/sysfs: Tidy SMBIOS & ACPI label attributes
PCI/sysfs: Convert "index", "acpi_index", "label" to static attributes
PCI/sysfs: Define SMBIOS label attributes with DEVICE_ATTR*()
PCI/sysfs: Define ACPI label attributes with DEVICE_ATTR*()
PCI/sysfs: Rename device_has_dsm() to device_has_acpi_name()
PCI/sysfs: Convert "vpd" to static attribute
PCI/sysfs: Rename "vpd" attribute accessors
PCI/sysfs: Convert "reset" to static attribute
PCI/sysfs: Convert "rom" to static attribute
PCI/sysfs: Convert "config" to static attribute
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index b62006f216f9..ce17dbc687b4 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -458,7 +458,6 @@ struct pci_dev { u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; - struct bin_attribute *rom_attr; /* Attribute descriptor for sysfs ROM entry */ int rom_attr_enabled; /* Display of ROM attribute enabled? */ struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ |