Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ibmphp: Rename add_range() to add_bus_range() to avoid conflict

Rename add_range() to add_bus_range() to avoid conflict with the
naming of the generic range manipulation functions.

LKML-Reference: <1265793639-15071-4-git-send-email-yinghai@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

+7 -7
+7 -7
drivers/pci/hotplug/ibmphp_res.c
··· 40 40 static int once_over (void); 41 41 static int remove_ranges (struct bus_node *, struct bus_node *); 42 42 static int update_bridge_ranges (struct bus_node **); 43 - static int add_range (int type, struct range_node *, struct bus_node *); 43 + static int add_bus_range (int type, struct range_node *, struct bus_node *); 44 44 static void fix_resources (struct bus_node *); 45 45 static struct bus_node *find_bus_wprev (u8, struct bus_node **, u8); 46 46 ··· 133 133 newrange->rangeno = 1; 134 134 else { 135 135 /* need to insert our range */ 136 - add_range (flag, newrange, newbus); 136 + add_bus_range (flag, newrange, newbus); 137 137 debug ("%d resource Primary Bus inserted on bus %x [%x - %x]\n", flag, newbus->busno, newrange->start, newrange->end); 138 138 } 139 139 ··· 384 384 * Input: type of the resource, range to add, current bus 385 385 * Output: 0 or -1, bus and range ptrs 386 386 ********************************************************************************/ 387 - static int add_range (int type, struct range_node *range, struct bus_node *bus_cur) 387 + static int add_bus_range (int type, struct range_node *range, struct bus_node *bus_cur) 388 388 { 389 389 struct range_node *range_cur = NULL; 390 390 struct range_node *range_prev; ··· 455 455 456 456 /******************************************************************************* 457 457 * This routine goes through the list of resources of type 'type' and updates 458 - * the range numbers that they correspond to. It was called from add_range fnc 458 + * the range numbers that they correspond to. It was called from add_bus_range fnc 459 459 * 460 460 * Input: bus, type of the resource, the rangeno starting from which to update 461 461 ******************************************************************************/ ··· 1999 1999 2000 2000 if (bus_sec->noIORanges > 0) { 2001 2001 if (!range_exists_already (range, bus_sec, IO)) { 2002 - add_range (IO, range, bus_sec); 2002 + add_bus_range (IO, range, bus_sec); 2003 2003 ++bus_sec->noIORanges; 2004 2004 } else { 2005 2005 kfree (range); ··· 2048 2048 2049 2049 if (bus_sec->noMemRanges > 0) { 2050 2050 if (!range_exists_already (range, bus_sec, MEM)) { 2051 - add_range (MEM, range, bus_sec); 2051 + add_bus_range (MEM, range, bus_sec); 2052 2052 ++bus_sec->noMemRanges; 2053 2053 } else { 2054 2054 kfree (range); ··· 2102 2102 2103 2103 if (bus_sec->noPFMemRanges > 0) { 2104 2104 if (!range_exists_already (range, bus_sec, PFMEM)) { 2105 - add_range (PFMEM, range, bus_sec); 2105 + add_bus_range (PFMEM, range, bus_sec); 2106 2106 ++bus_sec->noPFMemRanges; 2107 2107 } else { 2108 2108 kfree (range);