Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: convert bus code to use bus_groups

Browse Source 
The bus_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the PCI bus code to use the
correct field.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-10-07 14:51:02 -06:00 committed by Bjorn Helgaas
parent 4a10c2ac2f
commit 0f49ba5599
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci-driver.c
View File

@ -1317,7 +1317,7 @@ struct bus_type pci_bus_type = {
.remove = pci_device_remove, .remove = pci_device_remove,
.shutdown = pci_device_shutdown, .shutdown = pci_device_shutdown,
.dev_attrs = pci_dev_attrs, .dev_attrs = pci_dev_attrs,
.bus_attrs = pci_bus_attrs, .bus_groups = pci_bus_groups,
.drv_attrs = pci_drv_attrs, .drv_attrs = pci_drv_attrs,
.pm = PCI_PM_OPS_PTR, .pm = PCI_PM_OPS_PTR,
}; };

16
drivers/pci/pci-sysfs.c
View File

@ -302,10 +302,20 @@ static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
} }
return count; return count;
} }
static BUS_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store);
struct bus_attribute pci_bus_attrs[] = { struct attribute *pci_bus_attrs[] = {
__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store), &bus_attr_rescan.attr,
__ATTR_NULL NULL,
};
static const struct attribute_group pci_bus_group = {
.attrs = pci_bus_attrs,
};
const struct attribute_group *pci_bus_groups[] = {
&pci_bus_group,
NULL,
}; };
static ssize_t static ssize_t

2
drivers/pci/pci.h
View File

@ -156,7 +156,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 const struct attribute_group *pcibus_groups[]; extern const struct attribute_group *pcibus_groups[];
extern struct device_type pci_dev_type; extern struct device_type pci_dev_type;
extern struct bus_attribute pci_bus_attrs[]; extern const struct attribute_group *pci_bus_groups[];
/** /**