Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits) pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US ipv4: Fix fib_trie rebalancing Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver Bluetooth: Fix Kconfig issue with RFKILL integration PIM-SM: namespace changes ipv4: update ARPD help text net: use a deferred timer in rt_check_expire ieee802154: fix kconfig bool/tristate muckup bonding: initialization rework bonding: use is_zero_ether_addr bonding: network device names are case sensative bonding: elminate bad refcount code bonding: fix style issues bonding: fix destructor bonding: remove bonding read/write semaphore bonding: initialize before registration bonding: bond_create always called with default parameters x_tables: Convert printk to pr_err netfilter: conntrack: optional reliable conntrack event delivery list_nulls: add hlist_nulls_add_head and hlist_nulls_del ...
This commit is contained in:
@@ -495,6 +495,30 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(of_modalias_node);
|
||||
|
||||
/**
|
||||
* of_parse_phandle - Resolve a phandle property to a device_node pointer
|
||||
* @np: Pointer to device node holding phandle property
|
||||
* @phandle_name: Name of property holding a phandle value
|
||||
* @index: For properties holding a table of phandles, this is the index into
|
||||
* the table
|
||||
*
|
||||
* Returns the device_node pointer with refcount incremented. Use
|
||||
* of_node_put() on it when done.
|
||||
*/
|
||||
struct device_node *
|
||||
of_parse_phandle(struct device_node *np, const char *phandle_name, int index)
|
||||
{
|
||||
const phandle *phandle;
|
||||
int size;
|
||||
|
||||
phandle = of_get_property(np, phandle_name, &size);
|
||||
if ((!phandle) || (size < sizeof(*phandle) * (index + 1)))
|
||||
return NULL;
|
||||
|
||||
return of_find_node_by_phandle(phandle[index]);
|
||||
}
|
||||
EXPORT_SYMBOL(of_parse_phandle);
|
||||
|
||||
/**
|
||||
* of_parse_phandles_with_args - Find a node pointed by phandle in a list
|
||||
* @np: pointer to a device tree node containing a list
|
||||
|
Reference in New Issue
Block a user