PCI: Add pci_device_type to pdev's device struct

Need type filled in device structure so it can be used for visible
attribute control in sysfs for pci_dev.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Yinghai Lu 2012-11-05 15:20:34 -05:00 committed by Bjorn Helgaas
parent 8f0d8163b5
commit 4e15c46bdc
3 changed files with 26 additions and 0 deletions

View File

@ -1411,3 +1411,27 @@ static int __init pci_sysfs_init(void)
} }
late_initcall(pci_sysfs_init); late_initcall(pci_sysfs_init);
static struct attribute *pci_dev_dev_attrs[] = {
NULL,
};
static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,
struct attribute *a, int n)
{
return a->mode;
}
static struct attribute_group pci_dev_attr_group = {
.attrs = pci_dev_dev_attrs,
.is_visible = pci_dev_attrs_are_visible,
};
static const struct attribute_group *pci_dev_attr_groups[] = {
&pci_dev_attr_group,
NULL,
};
struct device_type pci_dev_type = {
.groups = pci_dev_attr_groups,
};

View File

@ -157,6 +157,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
} }
extern struct device_attribute pci_dev_attrs[]; extern struct device_attribute pci_dev_attrs[];
extern struct device_attribute pcibus_dev_attrs[]; extern struct device_attribute pcibus_dev_attrs[];
extern struct device_type pci_dev_type;
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG
extern struct bus_attribute pci_bus_attrs[]; extern struct bus_attribute pci_bus_attrs[];
#else #else

View File

@ -975,6 +975,7 @@ int pci_setup_device(struct pci_dev *dev)
dev->sysdata = dev->bus->sysdata; dev->sysdata = dev->bus->sysdata;
dev->dev.parent = dev->bus->bridge; dev->dev.parent = dev->bus->bridge;
dev->dev.bus = &pci_bus_type; dev->dev.bus = &pci_bus_type;
dev->dev.type = &pci_dev_type;
dev->hdr_type = hdr_type & 0x7f; dev->hdr_type = hdr_type & 0x7f;
dev->multifunction = !!(hdr_type & 0x80); dev->multifunction = !!(hdr_type & 0x80);
dev->error_state = pci_channel_io_normal; dev->error_state = pci_channel_io_normal;