linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>,
	Guo Chao <yan@linux.vnet.ibm.com>,
	linux-pci@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 1/6] PCI: move back pci_proc_attach_devices calling
Date: Tue, 19 Nov 2013 17:51:52 -0800	[thread overview]
Message-ID: <1384912317-3721-2-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1384912317-3721-1-git-send-email-yinghai@kernel.org>

We stop detach proc when pci_stop_device.
So should attach that during pci_bus_add_device.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/bus.c   | 1 +
 drivers/pci/probe.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index fc1b740..1ffd95b 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -175,6 +175,7 @@ int pci_bus_add_device(struct pci_dev *dev)
 	 * are not assigned yet for some devices.
 	 */
 	pci_fixup_device(pci_fixup_final, dev);
+	pci_proc_attach_device(dev);
 	pci_create_sysfs_dev_files(dev);
 
 	dev->match_driver = true;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 38e403d..173a9cf 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1381,8 +1381,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 	dev->match_driver = false;
 	ret = device_add(&dev->dev);
 	WARN_ON(ret < 0);
-
-	pci_proc_attach_device(dev);
 }
 
 struct pci_dev *__ref pci_scan_single_device(struct pci_bus *bus, int devfn)
-- 
1.8.1.4


  reply	other threads:[~2013-11-20  1:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-20  1:51 [PATCH 0/6] PCI: double remove fixing and allocate 64bit mmio pref Yinghai Lu
2013-11-20  1:51 ` Yinghai Lu [this message]
2013-11-20  1:51 ` [PATCH 2/6] PCI: move resources and bus_list releasing to pci_release_dev Yinghai Lu
2013-11-20  1:51 ` [PATCH 3/6] PCI: Destroy pci dev only once Yinghai Lu
2013-11-20  1:51 ` [PATCH 4/6] PCI: pcibus address to resource converting take bus directly Yinghai Lu
2013-11-20  1:51 ` [PATCH 5/6] PCI: Add pcibios_bus_addr_to_res() Yinghai Lu
2013-11-20  1:51 ` [PATCH 6/6] PCI: Try to allocate mem64 above 4G at first Yinghai Lu
2013-11-21 10:30   ` Guo Chao
2013-11-21 20:18     ` Yinghai Lu
2013-11-21 21:05       ` Linus Torvalds
2013-11-21 21:34         ` Yinghai Lu
2013-11-21 21:42           ` Linus Torvalds
2013-11-22  6:11             ` Yinghai Lu
2013-11-22  7:08               ` Guo Chao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384912317-3721-2-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=guz.fnst@cn.fujitsu.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=yan@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).