PCI/sysfs: move bus cpuaffinity to class dev_attrs (dc2c2c9d) · Commits · e / devices / android_kernel_teracube_emerald

drivers/pci/bus.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -163,12 +163,6 @@ int pci_bus_add_child(struct pci_bus *bus)

	bus->is_added = 1;		bus->is_added = 1;

	retval = device_create_file(&bus->dev, &dev_attr_cpuaffinity);
	if (retval)
	return retval;

	retval = device_create_file(&bus->dev, &dev_attr_cpulistaffinity);

	/* Create legacy_io and legacy_mem files for this bus */		/* Create legacy_io and legacy_mem files for this bus */
	pci_create_legacy_files(bus);		pci_create_legacy_files(bus);

drivers/pci/pci-sysfs.c

+36 −0

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,40 @@ static ssize_t local_cpulist_show(struct device *dev,
	return len;		return len;
	}		}

			/*
			* PCI Bus Class Devices
			*/
			static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
			int type,
			struct device_attribute *attr,
			char *buf)
			{
			int ret;
			const struct cpumask *cpumask;

			cpumask = cpumask_of_pcibus(to_pci_bus(dev));
			ret = type ?
			cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask) :
			cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask);
			buf[ret++] = '\n';
			buf[ret] = '\0';
			return ret;
			}

			static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
			struct device_attribute *attr,
			char *buf)
			{
			return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
			}

			static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
			struct device_attribute *attr,
			char *buf)
			{
			return pci_bus_show_cpuaffinity(dev, 1, attr, buf);
			}

	/* show resources */		/* show resources */
	static ssize_t		static ssize_t
	resource_show(struct device * dev, struct device_attribute attr, char buf)		resource_show(struct device * dev, struct device_attribute attr, char buf)
	@@ -370,6 +404,8 @@ struct device_attribute pcibus_dev_attrs[] = {
	#ifdef CONFIG_HOTPLUG		#ifdef CONFIG_HOTPLUG
	__ATTR(rescan, (S_IWUSR\|S_IWGRP), NULL, dev_bus_rescan_store),		__ATTR(rescan, (S_IWUSR\|S_IWGRP), NULL, dev_bus_rescan_store),
	#endif		#endif
			__ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL),
			__ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL),
	__ATTR_NULL,		__ATTR_NULL,
	};		};

drivers/pci/pci.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -157,8 +157,6 @@ 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_attribute dev_attr_cpuaffinity;
	extern struct device_attribute dev_attr_cpulistaffinity;
	#ifdef CONFIG_HOTPLUG		#ifdef CONFIG_HOTPLUG
	extern struct bus_attribute pci_bus_attrs[];		extern struct bus_attribute pci_bus_attrs[];
	#else		#else

drivers/pci/probe.c

+0 −42

Original line number	Original line	Diff line number	Diff line
	@@ -42,43 +42,6 @@ int no_pci_devices(void)
	}		}
	EXPORT_SYMBOL(no_pci_devices);		EXPORT_SYMBOL(no_pci_devices);

	/*
	* PCI Bus Class Devices
	*/
	static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
	int type,
	struct device_attribute *attr,
	char *buf)
	{
	int ret;
	const struct cpumask *cpumask;

	cpumask = cpumask_of_pcibus(to_pci_bus(dev));
	ret = type?
	cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask) :
	cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask);
	buf[ret++] = '\n';
	buf[ret] = '\0';
	return ret;
	}

	static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
	struct device_attribute *attr,
	char *buf)
	{
	return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
	}

	static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
	struct device_attribute *attr,
	char *buf)
	{
	return pci_bus_show_cpuaffinity(dev, 1, attr, buf);
	}

	DEVICE_ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL);
	DEVICE_ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL);

	/*		/*
	* PCI Bus Class		* PCI Bus Class
	*/		*/
	@@ -1456,9 +1419,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
	error = device_register(&b->dev);		error = device_register(&b->dev);
	if (error)		if (error)
	goto class_dev_reg_err;		goto class_dev_reg_err;
	error = device_create_file(&b->dev, &dev_attr_cpuaffinity);
	if (error)
	goto dev_create_file_err;

	/* Create legacy_io and legacy_mem files for this bus */		/* Create legacy_io and legacy_mem files for this bus */
	pci_create_legacy_files(b);		pci_create_legacy_files(b);
	@@ -1469,8 +1429,6 @@ struct pci_bus * pci_create_bus(struct device *parent,

	return b;		return b;

	dev_create_file_err:
	device_unregister(&b->dev);
	class_dev_reg_err:		class_dev_reg_err:
	device_unregister(dev);		device_unregister(dev);
	dev_reg_err:		dev_reg_err:

drivers/pci/remove.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,6 @@ void pci_remove_bus(struct pci_bus *pci_bus)
	return;		return;

	pci_remove_legacy_files(pci_bus);		pci_remove_legacy_files(pci_bus);
	device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
	device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity);
	device_unregister(&pci_bus->dev);		device_unregister(&pci_bus->dev);
	}		}
	EXPORT_SYMBOL(pci_remove_bus);		EXPORT_SYMBOL(pci_remove_bus);