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

Merge tag 'devprop-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull device properties code update from Rafael Wysocki:
"This is based on new i2c material for 5.18-rc1 and simply reorganizes
the code on top of it so as to group similar functions together (Andy
Shevchenko)"

* tag 'devprop-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
device property: Don't split fwnode_get_irq*() APIs in the code

+19 -19
+16 -16
drivers/base/property.c
··· 896 896 EXPORT_SYMBOL_GPL(device_get_phy_mode); 897 897 898 898 /** 899 + * fwnode_iomap - Maps the memory mapped IO for a given fwnode 900 + * @fwnode: Pointer to the firmware node 901 + * @index: Index of the IO range 902 + * 903 + * Returns a pointer to the mapped memory. 904 + */ 905 + void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index) 906 + { 907 + if (IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode)) 908 + return of_iomap(to_of_node(fwnode), index); 909 + 910 + return NULL; 911 + } 912 + EXPORT_SYMBOL(fwnode_iomap); 913 + 914 + /** 899 915 * fwnode_irq_get - Get IRQ directly from a fwnode 900 916 * @fwnode: Pointer to the firmware node 901 917 * @index: Zero-based index of the IRQ ··· 934 918 return res.start; 935 919 } 936 920 EXPORT_SYMBOL(fwnode_irq_get); 937 - 938 - /** 939 - * fwnode_iomap - Maps the memory mapped IO for a given fwnode 940 - * @fwnode: Pointer to the firmware node 941 - * @index: Index of the IO range 942 - * 943 - * Returns a pointer to the mapped memory. 944 - */ 945 - void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index) 946 - { 947 - if (IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode)) 948 - return of_iomap(to_of_node(fwnode), index); 949 - 950 - return NULL; 951 - } 952 - EXPORT_SYMBOL(fwnode_iomap); 953 921 954 922 /** 955 923 * fwnode_irq_get_byname - Get IRQ from a fwnode using its name
+3 -3
include/linux/property.h
··· 123 123 int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index); 124 124 int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name); 125 125 126 - void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index); 127 - 128 126 unsigned int device_get_child_node_count(struct device *dev); 129 127 130 128 static inline bool device_property_read_bool(struct device *dev, ··· 386 388 const void *device_get_match_data(struct device *dev); 387 389 388 390 int device_get_phy_mode(struct device *dev); 389 - 390 391 int fwnode_get_phy_mode(struct fwnode_handle *fwnode); 392 + 393 + void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index); 394 + 391 395 struct fwnode_handle *fwnode_graph_get_next_endpoint( 392 396 const struct fwnode_handle *fwnode, struct fwnode_handle *prev); 393 397 struct fwnode_handle *