aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
commite6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch)
tree88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/pci
parent37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff)
parentf1c488a78d9f1a22cdb15648c15e70fd82ed229a (diff)
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-dra7xx.c1
-rw-r--r--drivers/pci/host/pci-exynos.c1
-rw-r--r--drivers/pci/host/pci-host-generic.c1
-rw-r--r--drivers/pci/host/pci-imx6.c1
-rw-r--r--drivers/pci/host/pci-keystone.c1
-rw-r--r--drivers/pci/host/pci-mvebu.c1
-rw-r--r--drivers/pci/host/pci-rcar-gen2.c1
-rw-r--r--drivers/pci/host/pci-tegra.c1
-rw-r--r--drivers/pci/host/pci-xgene.c1
-rw-r--r--drivers/pci/host/pcie-rcar.c1
-rw-r--r--drivers/pci/host/pcie-spear13xx.c1
-rw-r--r--drivers/pci/host/pcie-xilinx.c1
-rw-r--r--drivers/pci/pci-sysfs.c39
13 files changed, 10 insertions, 41 deletions
diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index 8c6969747acd..2d57e19a2cd4 100644
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -446,7 +446,6 @@ static struct platform_driver dra7xx_pcie_driver = {
446 .remove = __exit_p(dra7xx_pcie_remove), 446 .remove = __exit_p(dra7xx_pcie_remove),
447 .driver = { 447 .driver = {
448 .name = "dra7-pcie", 448 .name = "dra7-pcie",
449 .owner = THIS_MODULE,
450 .of_match_table = of_dra7xx_pcie_match, 449 .of_match_table = of_dra7xx_pcie_match,
451 }, 450 },
452}; 451};
diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index 850c9f951a3f..d202b37c3698 100644
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -641,7 +641,6 @@ static struct platform_driver exynos_pcie_driver = {
641 .remove = __exit_p(exynos_pcie_remove), 641 .remove = __exit_p(exynos_pcie_remove),
642 .driver = { 642 .driver = {
643 .name = "exynos-pcie", 643 .name = "exynos-pcie",
644 .owner = THIS_MODULE,
645 .of_match_table = exynos_pcie_of_match, 644 .of_match_table = exynos_pcie_of_match,
646 }, 645 },
647}; 646};
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
index 18959075d164..6eb1aa75bd37 100644
--- a/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@ -310,7 +310,6 @@ static int gen_pci_probe(struct platform_device *pdev)
310static struct platform_driver gen_pci_driver = { 310static struct platform_driver gen_pci_driver = {
311 .driver = { 311 .driver = {
312 .name = "pci-host-generic", 312 .name = "pci-host-generic",
313 .owner = THIS_MODULE,
314 .of_match_table = gen_pci_of_match, 313 .of_match_table = gen_pci_of_match,
315 }, 314 },
316 .probe = gen_pci_probe, 315 .probe = gen_pci_probe,
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index d1a26d17b586..fdb95367721e 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -643,7 +643,6 @@ MODULE_DEVICE_TABLE(of, imx6_pcie_of_match);
643static struct platform_driver imx6_pcie_driver = { 643static struct platform_driver imx6_pcie_driver = {
644 .driver = { 644 .driver = {
645 .name = "imx6q-pcie", 645 .name = "imx6q-pcie",
646 .owner = THIS_MODULE,
647 .of_match_table = imx6_pcie_of_match, 646 .of_match_table = imx6_pcie_of_match,
648 }, 647 },
649 .shutdown = imx6_pcie_shutdown, 648 .shutdown = imx6_pcie_shutdown,
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 62b9454c86fb..78f79e31ac5c 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -402,7 +402,6 @@ static struct platform_driver ks_pcie_driver __refdata = {
402 .remove = __exit_p(ks_pcie_remove), 402 .remove = __exit_p(ks_pcie_remove),
403 .driver = { 403 .driver = {
404 .name = "keystone-pcie", 404 .name = "keystone-pcie",
405 .owner = THIS_MODULE,
406 .of_match_table = of_match_ptr(ks_pcie_of_match), 405 .of_match_table = of_match_ptr(ks_pcie_of_match),
407 }, 406 },
408}; 407};
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index fed3fab132f2..1dd759596b0a 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1081,7 +1081,6 @@ MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
1081 1081
1082static struct platform_driver mvebu_pcie_driver = { 1082static struct platform_driver mvebu_pcie_driver = {
1083 .driver = { 1083 .driver = {
1084 .owner = THIS_MODULE,
1085 .name = "mvebu-pcie", 1084 .name = "mvebu-pcie",
1086 .of_match_table = mvebu_pcie_of_match_table, 1085 .of_match_table = mvebu_pcie_of_match_table,
1087 /* driver unloading/unbinding currently not supported */ 1086 /* driver unloading/unbinding currently not supported */
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 3ef854f5a5b5..d9c042febb1a 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -412,7 +412,6 @@ MODULE_DEVICE_TABLE(of, rcar_pci_of_match);
412static struct platform_driver rcar_pci_driver = { 412static struct platform_driver rcar_pci_driver = {
413 .driver = { 413 .driver = {
414 .name = "pci-rcar-gen2", 414 .name = "pci-rcar-gen2",
415 .owner = THIS_MODULE,
416 .suppress_bind_attrs = true, 415 .suppress_bind_attrs = true,
417 .of_match_table = rcar_pci_of_match, 416 .of_match_table = rcar_pci_of_match,
418 }, 417 },
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index feccfa6b6c11..a800ae916394 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -2129,7 +2129,6 @@ put_resources:
2129static struct platform_driver tegra_pcie_driver = { 2129static struct platform_driver tegra_pcie_driver = {
2130 .driver = { 2130 .driver = {
2131 .name = "tegra-pcie", 2131 .name = "tegra-pcie",
2132 .owner = THIS_MODULE,
2133 .of_match_table = tegra_pcie_of_match, 2132 .of_match_table = tegra_pcie_of_match,
2134 .suppress_bind_attrs = true, 2133 .suppress_bind_attrs = true,
2135 }, 2134 },
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 2988fe136c1e..b1d0596457c5 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -652,7 +652,6 @@ static const struct of_device_id xgene_pcie_match_table[] = {
652static struct platform_driver xgene_pcie_driver = { 652static struct platform_driver xgene_pcie_driver = {
653 .driver = { 653 .driver = {
654 .name = "xgene-pcie", 654 .name = "xgene-pcie",
655 .owner = THIS_MODULE,
656 .of_match_table = of_match_ptr(xgene_pcie_match_table), 655 .of_match_table = of_match_ptr(xgene_pcie_match_table),
657 }, 656 },
658 .probe = xgene_pcie_probe_bridge, 657 .probe = xgene_pcie_probe_bridge,
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 5519e939e412..748786c402fc 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -981,7 +981,6 @@ static int rcar_pcie_probe(struct platform_device *pdev)
981static struct platform_driver rcar_pcie_driver = { 981static struct platform_driver rcar_pcie_driver = {
982 .driver = { 982 .driver = {
983 .name = DRV_NAME, 983 .name = DRV_NAME,
984 .owner = THIS_MODULE,
985 .of_match_table = rcar_pcie_of_match, 984 .of_match_table = rcar_pcie_of_match,
986 .suppress_bind_attrs = true, 985 .suppress_bind_attrs = true,
987 }, 986 },
diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c
index 2ca10cc887ee..866465fd3dbf 100644
--- a/drivers/pci/host/pcie-spear13xx.c
+++ b/drivers/pci/host/pcie-spear13xx.c
@@ -374,7 +374,6 @@ static struct platform_driver spear13xx_pcie_driver __initdata = {
374 .probe = spear13xx_pcie_probe, 374 .probe = spear13xx_pcie_probe,
375 .driver = { 375 .driver = {
376 .name = "spear-pcie", 376 .name = "spear-pcie",
377 .owner = THIS_MODULE,
378 .of_match_table = of_match_ptr(spear13xx_pcie_of_match), 377 .of_match_table = of_match_ptr(spear13xx_pcie_of_match),
379 }, 378 },
380}; 379};
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 2f50fa5953fd..ef3ebaf9a738 100644
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -947,7 +947,6 @@ static struct of_device_id xilinx_pcie_of_match[] = {
947static struct platform_driver xilinx_pcie_driver = { 947static struct platform_driver xilinx_pcie_driver = {
948 .driver = { 948 .driver = {
949 .name = "xilinx-pcie", 949 .name = "xilinx-pcie",
950 .owner = THIS_MODULE,
951 .of_match_table = xilinx_pcie_of_match, 950 .of_match_table = xilinx_pcie_of_match,
952 .suppress_bind_attrs = true, 951 .suppress_bind_attrs = true,
953 }, 952 },
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index a62acc443d5b..aa012fb3834b 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -77,11 +77,10 @@ static ssize_t broken_parity_status_store(struct device *dev,
77} 77}
78static DEVICE_ATTR_RW(broken_parity_status); 78static DEVICE_ATTR_RW(broken_parity_status);
79 79
80static ssize_t pci_dev_show_local_cpu(struct device *dev, int type, 80static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list,
81 struct device_attribute *attr, char *buf) 81 struct device_attribute *attr, char *buf)
82{ 82{
83 const struct cpumask *mask; 83 const struct cpumask *mask;
84 int len;
85 84
86#ifdef CONFIG_NUMA 85#ifdef CONFIG_NUMA
87 mask = (dev_to_node(dev) == -1) ? cpu_online_mask : 86 mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
@@ -89,59 +88,41 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, int type,
89#else 88#else
90 mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); 89 mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
91#endif 90#endif
92 len = type ? 91 return cpumap_print_to_pagebuf(list, buf, mask);
93 cpumask_scnprintf(buf, PAGE_SIZE-2, mask) :
94 cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
95
96 buf[len++] = '\n';
97 buf[len] = '\0';
98 return len;
99} 92}
100 93
101static ssize_t local_cpus_show(struct device *dev, 94static ssize_t local_cpus_show(struct device *dev,
102 struct device_attribute *attr, char *buf) 95 struct device_attribute *attr, char *buf)
103{ 96{
104 return pci_dev_show_local_cpu(dev, 1, attr, buf); 97 return pci_dev_show_local_cpu(dev, false, attr, buf);
105} 98}
106static DEVICE_ATTR_RO(local_cpus); 99static DEVICE_ATTR_RO(local_cpus);
107 100
108static ssize_t local_cpulist_show(struct device *dev, 101static ssize_t local_cpulist_show(struct device *dev,
109 struct device_attribute *attr, char *buf) 102 struct device_attribute *attr, char *buf)
110{ 103{
111 return pci_dev_show_local_cpu(dev, 0, attr, buf); 104 return pci_dev_show_local_cpu(dev, true, attr, buf);
112} 105}
113static DEVICE_ATTR_RO(local_cpulist); 106static DEVICE_ATTR_RO(local_cpulist);
114 107
115/* 108/*
116 * PCI Bus Class Devices 109 * PCI Bus Class Devices
117 */ 110 */
118static ssize_t pci_bus_show_cpuaffinity(struct device *dev, int type,
119 struct device_attribute *attr,
120 char *buf)
121{
122 int ret;
123 const struct cpumask *cpumask;
124
125 cpumask = cpumask_of_pcibus(to_pci_bus(dev));
126 ret = type ?
127 cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask) :
128 cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask);
129 buf[ret++] = '\n';
130 buf[ret] = '\0';
131 return ret;
132}
133
134static ssize_t cpuaffinity_show(struct device *dev, 111static ssize_t cpuaffinity_show(struct device *dev,
135 struct device_attribute *attr, char *buf) 112 struct device_attribute *attr, char *buf)
136{ 113{
137 return pci_bus_show_cpuaffinity(dev, 0, attr, buf); 114 const struct cpumask *cpumask = cpumask_of_pcibus(to_pci_bus(dev));
115
116 return cpumap_print_to_pagebuf(false, buf, cpumask);
138} 117}
139static DEVICE_ATTR_RO(cpuaffinity); 118static DEVICE_ATTR_RO(cpuaffinity);
140 119
141static ssize_t cpulistaffinity_show(struct device *dev, 120static ssize_t cpulistaffinity_show(struct device *dev,
142 struct device_attribute *attr, char *buf) 121 struct device_attribute *attr, char *buf)
143{ 122{
144 return pci_bus_show_cpuaffinity(dev, 1, attr, buf); 123 const struct cpumask *cpumask = cpumask_of_pcibus(to_pci_bus(dev));
124
125 return cpumap_print_to_pagebuf(true, buf, cpumask);
145} 126}
146static DEVICE_ATTR_RO(cpulistaffinity); 127static DEVICE_ATTR_RO(cpulistaffinity);
147 128