Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56039e65 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Bjorn Helgaas
Browse files

PCI: Convert class code to use dev_groups 



The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the PCI class code to use the
correct field.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 24336a61

drivers/pci/pci-sysfs.c

+21 −11
Original line number Diff line number Diff line
@@ -131,19 +131,19 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev, 
	return ret;

}



static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,

					struct device_attribute *attr,

					char *buf)

static ssize_t cpuaffinity_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	return pci_bus_show_cpuaffinity(dev, 0, attr, buf);

}

static DEVICE_ATTR_RO(cpuaffinity);



static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,

					struct device_attribute *attr,

					char *buf)

static ssize_t cpulistaffinity_show(struct device *dev,

				    struct device_attribute *attr, char *buf)

{

	return pci_bus_show_cpuaffinity(dev, 1, attr, buf);

}

static DEVICE_ATTR_RO(cpulistaffinity);



/* show resources */

static ssize_t
@@ -379,6 +379,7 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, 
	}

	return count;

}

static DEVICE_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store);



#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

static ssize_t d3cold_allowed_store(struct device *dev,
@@ -514,11 +515,20 @@ struct device_attribute pci_dev_attrs[] = { 
	__ATTR_NULL,

};



struct device_attribute pcibus_dev_attrs[] = {

	__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store),

	__ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL),

	__ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL),

	__ATTR_NULL,

static struct attribute *pcibus_attrs[] = {

	&dev_attr_rescan.attr,

	&dev_attr_cpuaffinity.attr,

	&dev_attr_cpulistaffinity.attr,

	NULL,

};



static const struct attribute_group pcibus_group = {

	.attrs = pcibus_attrs,

};



const struct attribute_group *pcibus_groups[] = {

	&pcibus_group,

	NULL,

};



static ssize_t

drivers/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev) 


}

extern struct device_attribute pci_dev_attrs[];

extern struct device_attribute pcibus_dev_attrs[];

extern const struct attribute_group *pcibus_groups[];

extern struct device_type pci_dev_type;

extern struct bus_attribute pci_bus_attrs[];

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void release_pcibus_dev(struct device *dev) 
static struct class pcibus_class = {

	.name		= "pci_bus",

	.dev_release	= &release_pcibus_dev,

	.dev_attrs	= pcibus_dev_attrs,

	.dev_groups	= pcibus_groups,

};



static int __init pcibus_class_init(void)