Cleanup function name relating resource reassignment.

Existing functions don't have "pci_" prefix. But they are part of PCI
driver. So the patch adds "pci_" prefix to them.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 39f06e244d501bd313e584d89bde45cb5336a172..98ecb10ccbc7625c37ef03ec5d0b351cc1d27147 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1240,6 +1240,11 @@ running once the system is up.
                                bootloader. This is currently used on
                                IXP2000 systems where the bus has to be
                                configured a certain way for adjunct CPUs.
+               reassigndev=
+                               Format: [<segment>:]<bus>:<dev>.<func>[,[<segment>:]<bus>:<dev>.<func>[,...]]
+                               Specifies device to reassign page-aligned memory
+                               resources. PCI-PCI bridge can be specified, if
+                               resource windows need to be expanded.
                reassign_resources
                                Use guestdev parameter to reassign device's
                                resources.

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 86d960c7c2acdcb8e1379b56c25dcb2e236ea691..df7441f8705774b9d6d0213ff7fcb40435e1c7a7 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -100,10 +100,10 @@ pci_match_one_device(const struct pci_device_id *id, const struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PCI_REASSIGN
-extern int is_reassigndev(struct pci_dev *dev);
+extern int pci_is_reassigndev(struct pci_dev *dev);
 extern void pci_disable_bridge_window(struct pci_dev *dev);
 #else
-#define is_reassigndev(dev) 0
+#define pci_is_reassigndev(dev) 0
 #endif
 
 #ifdef CONFIG_PCI_GUESTDEV

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 65aeb34ab37f562d06118cff8bdbd09c31f6806f..027084ee64871de3e911fcf0f89fd6e6c5cf28b7 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -36,7 +36,7 @@ static void __devinit quirk_release_resources(struct pci_dev *dev)
        int i;
        struct resource *r;
 
-       if (is_reassigndev(dev)) {
+       if (pci_is_reassigndev(dev)) {
                if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
                    (dev->class >> 8) == PCI_CLASS_BRIDGE_HOST) {
                        /* PCI Host Bridge isn't a target device */

diff --git a/drivers/pci/reassigndev.c b/drivers/pci/reassigndev.c
index d1e39554fa3b3abc19833970d6488467dc733e4e..efae75ab731d5860508615da70ba0f481bd2eb31 100644 (file)
--- a/drivers/pci/reassigndev.c
+++ b/drivers/pci/reassigndev.c
@@ -26,15 +26,15 @@
 
 static char param_reassigndev[REASSIGNDEV_PARAM_MAX] = {0};
 
-static int __init reassigndev_setup(char *str)
+static int __init pci_reassigndev_setup(char *str)
 {
        strncpy(param_reassigndev, str, REASSIGNDEV_PARAM_MAX);
        param_reassigndev[REASSIGNDEV_PARAM_MAX - 1] = '\0';
        return 1;
 }
-__setup("reassigndev=", reassigndev_setup);
+__setup("reassigndev=", pci_reassigndev_setup);
 
-int is_reassigndev(struct pci_dev *dev)
+int pci_is_reassigndev(struct pci_dev *dev)
 {
        char dev_str[TOKEN_MAX+1];
        int seg, bus, slot, func;

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 588d6f855402042e6160c8acd13ebf7f9d8ebc43..12cab0682e7a0a66057e2cd6f05c93fe7b903af9 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -345,7 +345,7 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
                int i;
-               int reassign = is_reassigndev(dev);
+               int reassign = pci_is_reassigndev(dev);
 
                for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                        struct resource *r = &dev->resource[i];

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index c38762b09654bf7d875074d7c04f460cf88af379..cfab14b56a246fd396792056b5a9bd35e96ba172 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -138,7 +138,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
        struct resource *res = dev->resource + resno;
        resource_size_t size, min, align;
        int ret;
-       int reassigndev = is_reassigndev(dev);
+       int reassigndev = pci_is_reassigndev(dev);
 
        size = res->end - res->start + 1;
        min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
@@ -234,7 +234,7 @@ void __devinit
 pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 {
        int i;
-       int reassigndev = is_reassigndev(dev);
+       int reassigndev = pci_is_reassigndev(dev);
 
        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                struct resource *r;
@@ -271,7 +271,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
                                        ln->res->start;
                                if ((idx < PCI_BRIDGE_RESOURCES) &&
                                    (ln->res->flags & IORESOURCE_MEM) &&
-                                   is_reassigndev(ln->dev))
+                                   pci_is_reassigndev(ln->dev))
                                        align = ALIGN(align, PAGE_SIZE);
                        }
                        if (r_align > align) {