lkml.org 
[lkml]   [2003]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] PCI hotplug changes for 2.5.54
ChangeSet 1.894, 2003/01/07 16:24:14-08:00, greg@kroah.com

IBM PCI Hotplug: fix compile time error due to find_bus() function name.


diff -Nru a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c
--- a/drivers/hotplug/ibmphp_core.c Tue Jan 7 16:45:11 2003
+++ b/drivers/hotplug/ibmphp_core.c Tue Jan 7 16:45:11 2003
@@ -769,11 +769,11 @@
* Parameters: bus number
* Returns : pci_bus * or NULL if not found
*/
-static struct pci_bus *find_bus (u8 busno)
+static struct pci_bus *ibmphp_find_bus (u8 busno)
{
const struct list_head *tmp;
struct pci_bus *bus;
- debug ("inside find_bus, busno = %x \n", busno);
+ debug ("inside %s, busno = %x \n", __FUNCTION__, busno);

list_for_each (tmp, &pci_root_buses) {
bus = (struct pci_bus *) pci_bus_b (tmp);
@@ -1002,7 +1002,7 @@
struct pci_dev *dev;
u16 l;

- if (find_bus (busno) || !(ibmphp_find_same_bus_num (busno)))
+ if (ibmphp_find_bus (busno) || !(ibmphp_find_same_bus_num (busno)))
return 1;

bus = kmalloc (sizeof (*bus), GFP_KERNEL);
@@ -1056,7 +1056,7 @@
func->dev = pci_find_slot (func->busno, (func->device << 3) | (func->function & 0x7));

if (func->dev == NULL) {
- dev0.bus = find_bus (func->busno);
+ dev0.bus = ibmphp_find_bus (func->busno);
dev0.devfn = ((func->device << 3) + (func->function & 0x7));
dev0.sysdata = dev0.bus->sysdata;

@@ -1636,7 +1636,7 @@
return -ENOMEM;
}

- bus = find_bus (0);
+ bus = ibmphp_find_bus (0);
if (!bus) {
err ("Can't find the root pci bus, can not continue\n");
return -ENODEV;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:32    [W:0.036 / U:0.644 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site