Two minor devicetree fixups for v3.8. Addition of dummy inlines and
constification of node argument to of_parse_phandle_with_args(). -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQy6rNAAoJEEFnBt12D9kBbaAQALQM65g8FIqTo4qzBqKHza9f 1PM+EfqsRVzngw7vUSXd0ui54MtUnpxSrqxywHj7cPNkHwq+6UBFDXeD5oJI1i0H IYhq/Ne40aFPAvA/W3+jqtwjH7j6An77c9P5L4CMddSgnIVaHf4n6YEpXgSIJiVz FXvlHljOUK+KAggc/HHgAOymeLALcLKqSSf11mSDHi1iBeEjrNyZpKSAzHAg44pf tE84yLCQXDbt2id8YYxXE6rIb6IwHBNSDY6YcxZWWHZqq5nNDyYTV4NqURViAu9+ KJy1pY578cvYNJYcuaOwZZpuN7bPLlfjNO0mgQnl7Z0wzDFr5LBDCJ8/BGmmUKmS ryWYDXMWFCvmDfa6H/uzcrgI7V1P3cG2t7B11Bvil6axTUUpFRqi6SyrB9jr+hrS gA+LnMo0IpSy+jePStAalFUyKK/8fOfgAG0bZrK4taU9qnLDlijfTGg3CBqEoMWD dssutlHW7YIGM1UC00vUARQ0rWUFDF5HAqVaE6OfCOvNqfDwrZMuF1gtg0ycWEaY UNbT1KvOmtu4Ypi6Jkv9NPLW9GfLmTuAPRYhusIUTPQJTS6o4ZflJ9jeohS69kLX 63qtMD/bpy8z5fYgS5D+EyNFxWmFKQfm3SDlHIIaouMMqd2IEr6CTRMisvZEmEnx qnt9fKKQkoPtwWPLG5ND =Zs/W -----END PGP SIGNATURE----- Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 Pull another devicetree update from Grant Likely: "Here's a couple more devicetree changes that I missed in the first pull by putting the tag in the wrong place. Two minor devicetree fixups for v3.8. Addition of dummy inlines and constification of node argument to of_parse_phandle_with_args()." * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: of: *node argument to of_parse_phandle_with_args should be const of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
This commit is contained in:
commit
4939e27d46
|
@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle);
|
|||
* To get a device_node of the `node2' node you may call this:
|
||||
* of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args);
|
||||
*/
|
||||
int of_parse_phandle_with_args(struct device_node *np, const char *list_name,
|
||||
int of_parse_phandle_with_args(const struct device_node *np, const char *list_name,
|
||||
const char *cells_name, int index,
|
||||
struct of_phandle_args *out_args)
|
||||
{
|
||||
|
|
|
@ -273,7 +273,7 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len);
|
|||
extern struct device_node *of_parse_phandle(const struct device_node *np,
|
||||
const char *phandle_name,
|
||||
int index);
|
||||
extern int of_parse_phandle_with_args(struct device_node *np,
|
||||
extern int of_parse_phandle_with_args(const struct device_node *np,
|
||||
const char *list_name, const char *cells_name, int index,
|
||||
struct of_phandle_args *out_args);
|
||||
|
||||
|
|
|
@ -29,6 +29,18 @@ static inline void of_i2c_register_devices(struct i2c_adapter *adap)
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* must call put_device() when done with returned i2c_adapter device */
|
||||
static inline struct i2c_adapter *of_find_i2c_adapter_by_node(
|
||||
struct device_node *node)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif /* CONFIG_OF_I2C */
|
||||
|
||||
#endif /* __LINUX_OF_I2C_H */
|
||||
|
|
Loading…
Reference in a new issue