* [PATCH Part2 v11 2/2] PCI: Remove deprecated pci_scan_bus_parented()
2015-04-28 9:32 [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
@ 2015-04-28 9:32 ` Yijing Wang
2015-05-27 1:15 ` [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-05-27 23:03 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Yijing Wang @ 2015-04-28 9:32 UTC (permalink / raw)
To: Bjorn Helgaas, Konrad Rzeszutek Wilk
Cc: xen-devel, linux-pci, dja, Arnd Bergmann, Yijing Wang
No one uses pci_scan_bus_parented() any more,
remove it.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/pci/probe.c | 19 -------------------
include/linux/pci.h | 2 --
2 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6675a7a..7d6a61c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2094,25 +2094,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
}
EXPORT_SYMBOL(pci_scan_root_bus);
-/* Deprecated; use pci_scan_root_bus() instead */
-struct pci_bus *pci_scan_bus_parented(struct device *parent,
- int bus, struct pci_ops *ops, void *sysdata)
-{
- LIST_HEAD(resources);
- struct pci_bus *b;
-
- pci_add_resource(&resources, &ioport_resource);
- pci_add_resource(&resources, &iomem_resource);
- pci_add_resource(&resources, &busn_resource);
- b = pci_create_root_bus(parent, bus, ops, sysdata, &resources);
- if (b)
- pci_scan_child_bus(b);
- else
- pci_free_resource_list(&resources);
- return b;
-}
-EXPORT_SYMBOL(pci_scan_bus_parented);
-
struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
void *sysdata)
{
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 353db8d..1ec0d5d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -773,8 +773,6 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
void pcibios_scan_specific_bus(int busn);
struct pci_bus *pci_find_bus(int domain, int busnr);
void pci_bus_add_devices(const struct pci_bus *bus);
-struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
- struct pci_ops *ops, void *sysdata);
struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
struct pci_ops *ops, void *sysdata,
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented()
2015-04-28 9:32 [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-04-28 9:32 ` [PATCH Part2 v11 2/2] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
@ 2015-05-27 1:15 ` Yijing Wang
2015-05-27 23:03 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Yijing Wang @ 2015-05-27 1:15 UTC (permalink / raw)
To: Yijing Wang, Bjorn Helgaas, Konrad Rzeszutek Wilk
Cc: xen-devel, linux-pci, dja, Arnd Bergmann
Hi Konrad, sorry to bother you again, any comments for this patch ?
Thanks!
Yijing.
On 2015/4/28 17:32, Yijing Wang wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Use pci_scan_root_bus() instead of deprecated function
> pci_scan_bus_parented().
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: xen-devel@lists.xenproject.org
> ---
> drivers/pci/xen-pcifront.c | 16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> index 7cfd2db..240f388 100644
> --- a/drivers/pci/xen-pcifront.c
> +++ b/drivers/pci/xen-pcifront.c
> @@ -446,9 +446,15 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
> unsigned int domain, unsigned int bus)
> {
> struct pci_bus *b;
> + LIST_HEAD(resources);
> struct pcifront_sd *sd = NULL;
> struct pci_bus_entry *bus_entry = NULL;
> int err = 0;
> + static struct resource busn_res = {
> + .start = 0,
> + .end = 255,
> + .flags = IORESOURCE_BUS,
> + };
>
> #ifndef CONFIG_PCI_DOMAINS
> if (domain != 0) {
> @@ -470,17 +476,21 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
> err = -ENOMEM;
> goto err_out;
> }
> + pci_add_resource(&resources, &ioport_resource);
> + pci_add_resource(&resources, &iomem_resource);
> + pci_add_resource(&resources, &busn_res);
> pcifront_init_sd(sd, domain, bus, pdev);
>
> pci_lock_rescan_remove();
>
> - b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
> - &pcifront_bus_ops, sd);
> + b = pci_scan_root_bus(&pdev->xdev->dev, bus,
> + &pcifront_bus_ops, sd, &resources);
> if (!b) {
> dev_err(&pdev->xdev->dev,
> "Error creating PCI Frontend Bus!\n");
> err = -ENOMEM;
> pci_unlock_rescan_remove();
> + pci_free_resource_list(&resources);
> goto err_out;
> }
>
> @@ -488,7 +498,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
>
> list_add(&bus_entry->list, &pdev->root_buses);
>
> - /* pci_scan_bus_parented skips devices which do not have a have
> + /* pci_scan_root_bus skips devices which do not have a
> * devfn==0. The pcifront_scan_bus enumerates all devfn. */
> err = pcifront_scan_bus(pdev, domain, bus, b);
>
>
--
Thanks!
Yijing
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented()
2015-04-28 9:32 [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-04-28 9:32 ` [PATCH Part2 v11 2/2] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
2015-05-27 1:15 ` [PATCH Part2 v11 1/2] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
@ 2015-05-27 23:03 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2015-05-27 23:03 UTC (permalink / raw)
To: Yijing Wang
Cc: Konrad Rzeszutek Wilk, xen-devel, linux-pci, dja, Arnd Bergmann
On Tue, Apr 28, 2015 at 05:32:33PM +0800, Yijing Wang wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Use pci_scan_root_bus() instead of deprecated function
> pci_scan_bus_parented().
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: xen-devel@lists.xenproject.org
Applied both to pci/enumeration for v4.2, thanks!
> ---
> drivers/pci/xen-pcifront.c | 16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> index 7cfd2db..240f388 100644
> --- a/drivers/pci/xen-pcifront.c
> +++ b/drivers/pci/xen-pcifront.c
> @@ -446,9 +446,15 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
> unsigned int domain, unsigned int bus)
> {
> struct pci_bus *b;
> + LIST_HEAD(resources);
> struct pcifront_sd *sd = NULL;
> struct pci_bus_entry *bus_entry = NULL;
> int err = 0;
> + static struct resource busn_res = {
> + .start = 0,
> + .end = 255,
> + .flags = IORESOURCE_BUS,
> + };
>
> #ifndef CONFIG_PCI_DOMAINS
> if (domain != 0) {
> @@ -470,17 +476,21 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
> err = -ENOMEM;
> goto err_out;
> }
> + pci_add_resource(&resources, &ioport_resource);
> + pci_add_resource(&resources, &iomem_resource);
> + pci_add_resource(&resources, &busn_res);
> pcifront_init_sd(sd, domain, bus, pdev);
>
> pci_lock_rescan_remove();
>
> - b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
> - &pcifront_bus_ops, sd);
> + b = pci_scan_root_bus(&pdev->xdev->dev, bus,
> + &pcifront_bus_ops, sd, &resources);
> if (!b) {
> dev_err(&pdev->xdev->dev,
> "Error creating PCI Frontend Bus!\n");
> err = -ENOMEM;
> pci_unlock_rescan_remove();
> + pci_free_resource_list(&resources);
> goto err_out;
> }
>
> @@ -488,7 +498,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
>
> list_add(&bus_entry->list, &pdev->root_buses);
>
> - /* pci_scan_bus_parented skips devices which do not have a have
> + /* pci_scan_root_bus skips devices which do not have a
> * devfn==0. The pcifront_scan_bus enumerates all devfn. */
> err = pcifront_scan_bus(pdev, domain, bus, b);
>
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread