clk_bulk_get_optional() allows to get a group of clocks where one or more is optional. For a not available clock, e.g. not specifed in the clock consumer node in DT, its respective struct clk pointer will be NULL. This allows for operating on a group of returned clocks (struct clk_bulk_data array) with existing clk_bulk* APIs.
Unified · Split
| @@ -75,8 +75,8 @@ void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) · 74 unmodified lines | |||
| 75 | } | 75 | } |
| 76 | EXPORT_SYMBOL_GPL(clk_bulk_put); | 76 | EXPORT_SYMBOL_GPL(clk_bulk_put); |
| 77 | 77 | ||
| 78 | int __must_check clk_bulk_get(struct device *dev, int num_clks, | 78 | static int __clk_bulk_get(struct device *dev, int num_clks, |
| 79 | struct clk_bulk_data *clks) | 79 | struct clk_bulk_data *clks, bool optional) |
| 80 | { | 80 | { |
| 81 | int ret; | 81 | int ret; |
| 82 | int i; | 82 | int i; |
| @@ -88,10 +88,14 @@ int __must_check clk_bulk_get(struct device *dev, int num_clks, · 5 unmodified lines | |||
| 88 | clks[i].clk = clk_get(dev, clks[i].id); | 88 | clks[i].clk = clk_get(dev, clks[i].id); |
| 89 | if (IS_ERR(clks[i].clk)) { | 89 | if (IS_ERR(clks[i].clk)) { |
| 90 | ret = PTR_ERR(clks[i].clk); | 90 | ret = PTR_ERR(clks[i].clk); |
| 91 | clks[i].clk = NULL; | ||
| 92 | |||
| 93 | if (ret == -ENOENT && optional) | ||
| 94 | continue; | ||
| 95 | |||
| 91 | if (ret != -EPROBE_DEFER) | 96 | if (ret != -EPROBE_DEFER) |
| 92 | dev_err(dev, "Failed to get clk '%s': %d\n", | 97 | dev_err(dev, "Failed to get clk '%s': %d\n", |
| 93 | clks[i].id, ret); | 98 | clks[i].id, ret); |
| 94 | clks[i].clk = NULL; | ||
| 95 | goto err; | 99 | goto err; |
| 96 | } | 100 | } |
| 97 | } | 101 | } |
| @@ -103,8 +107,21 @@ err: · 5 unmodified lines | |||
| 103 | 107 | ||
| 104 | return ret; | 108 | return ret; |
| 105 | } | 109 | } |
| 110 | |||
| 111 | int __must_check clk_bulk_get(struct device *dev, int num_clks, | ||
| 112 | struct clk_bulk_data *clks) | ||
| 113 | { | ||
| 114 | return __clk_bulk_get(dev, num_clks, clks, false); | ||
| 115 | } | ||
| 106 | EXPORT_SYMBOL(clk_bulk_get); | 116 | EXPORT_SYMBOL(clk_bulk_get); |
| 107 | 117 | ||
| 118 | int __must_check clk_bulk_get_optional(struct device *dev, int num_clks, | ||
| 119 | struct clk_bulk_data *clks) | ||
| 120 | { | ||
| 121 | return __clk_bulk_get(dev, num_clks, clks, true); | ||
| 122 | } | ||
| 123 | EXPORT_SYMBOL_GPL(clk_bulk_get_optional); | ||
| 124 | |||
| 108 | void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks) | 125 | void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks) |
| 109 | { | 126 | { |
| 110 | if (IS_ERR_OR_NULL(clks)) | 127 | if (IS_ERR_OR_NULL(clks)) |
| @@ -332,6 +332,19 @@ int __must_check clk_bulk_get(struct device *dev, int num_clks, · 331 unmodified lines | |||
| 332 | */ | 332 | */ |
| 333 | int __must_check clk_bulk_get_all(struct device *dev, | 333 | int __must_check clk_bulk_get_all(struct device *dev, |
| 334 | struct clk_bulk_data **clks); | 334 | struct clk_bulk_data **clks); |
| 335 | |||
| 336 | /** | ||
| 337 | * clk_bulk_get_optional - lookup and obtain a number of references to clock producer | ||
| 338 | * @dev: device for clock "consumer" | ||
| 339 | * @num_clks: the number of clk_bulk_data | ||
| 340 | * @clks: the clk_bulk_data table of consumer | ||
| 341 | * | ||
| 342 | * Behaves the same as clk_bulk_get() except where there is no clock producer. | ||
| 343 | * In this case, instead of returning -ENOENT, the function returns 0 and | ||
| 344 | * NULL for a clk for which a clock producer could not be determined. | ||
| 345 | */ | ||
| 346 | int __must_check clk_bulk_get_optional(struct device *dev, int num_clks, | ||
| 347 | struct clk_bulk_data *clks); | ||
| 335 | /** | 348 | /** |
| 336 | * devm_clk_bulk_get - managed get multiple clk consumers | 349 | * devm_clk_bulk_get - managed get multiple clk consumers |
| 337 | * @dev: device for clock "consumer" | 350 | * @dev: device for clock "consumer" |
| @@ -718,6 +731,12 @@ static inline int __must_check clk_bulk_get(struct device *dev, int num_clks, · 380 unmodified lines | |||
| 718 | return 0; | 731 | return 0; |
| 719 | } | 732 | } |
| 720 | 733 | ||
| 734 | static inline int __must_check clk_bulk_get_optional(struct device *dev, | ||
| 735 | int num_clks, struct clk_bulk_data *clks) | ||
| 736 | { | ||
| 737 | return 0; | ||
| 738 | } | ||
| 739 | |||
| 721 | static inline int __must_check clk_bulk_get_all(struct device *dev, | 740 | static inline int __must_check clk_bulk_get_all(struct device *dev, |
| 722 | struct clk_bulk_data **clks) | 741 | struct clk_bulk_data **clks) |
| 723 | { | 742 | { |