| Message ID | 1521602391-30356-2-git-send-email-aisheng.dong@nxp.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
Quoting Dong Aisheng (2018-03-20 20:19:48) > diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c > index 4c10456..4b357b2 100644 > --- a/drivers/clk/clk-bulk.c > +++ b/drivers/clk/clk-bulk.c > @@ -19,6 +19,38 @@ > #include <linux/clk.h> > #include <linux/device.h> > #include <linux/export.h> > +#include <linux/of.h> > + > +#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) Do we need these defines? of_clk_get() is a stub function when these configs are false. > +static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, > + struct clk_bulk_data *clks) > +{ > + int ret; > + int i; > + > + for (i = 0; i < num_clks; i++) > + clks[i].clk = NULL; > + > + for (i = 0; i < num_clks; i++) { > + clks[i].clk = of_clk_get(np, i); > + if (IS_ERR(clks[i].clk)) { > + ret = PTR_ERR(clks[i].clk); > + pr_err("%pOF: Failed to get clk index: %d ret: %d\n", > + np, i, ret); > + clks[i].clk = NULL; > + goto err; > + } > + } > + > + return 0; > + > +err: > + clk_bulk_put(i, clks); > + > + return ret; > +} > +EXPORT_SYMBOL(of_clk_bulk_get); It's static, so don't export it. -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
SGkgU3RlcGhlbiwNCg0KPiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBTdGVw aGVuIEJveWQgW21haWx0bzpzYm95ZEBrZXJuZWwub3JnXQ0KPiBTZW50OiBTYXR1cmRheSwgTWFy Y2ggMjQsIDIwMTggMTI6NTMgQU0NCj4gVG86IEEucy4gRG9uZyA8YWlzaGVuZy5kb25nQG54cC5j b20+OyBsaW51eC1jbGtAdmdlci5rZXJuZWwub3JnDQo+IENjOiBsaW51eC1rZXJuZWxAdmdlci5r ZXJuZWwub3JnOyBsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmc7DQo+IG10dXJx dWV0dGVAYmF5bGlicmUuY29tOyBoZGVnb2VkZUByZWRoYXQuY29tOw0KPiBiLnpvbG5pZXJraWVA c2Ftc3VuZy5jb207IGxpbnV4QGFybWxpbnV4Lm9yZy51azsgbGludXgtDQo+IGZiZGV2QHZnZXIu a2VybmVsLm9yZzsgZGwtbGludXgtaW14IDxsaW51eC1pbXhAbnhwLmNvbT47IEEucy4gRG9uZw0K PiA8YWlzaGVuZy5kb25nQG54cC5jb20+OyBTdGVwaGVuIEJveWQgPHNib3lkQGNvZGVhdXJvcmEu b3JnPjsgUnVzc2VsbA0KPiBLaW5nIDxsaW51eEBhcm0ubGludXgub3JnLnVrPg0KPiBTdWJqZWN0 OiBSZTogW1BBVENIIFYyIDEvNF0gY2xrOiBidWxrOiBhZGQgb2ZfY2xrX2J1bGtfZ2V0KCkNCj4g DQo+IFF1b3RpbmcgRG9uZyBBaXNoZW5nICgyMDE4LTAzLTIwIDIwOjE5OjQ4KQ0KPiA+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2Nsay9jbGstYnVsay5jIGIvZHJpdmVycy9jbGsvY2xrLWJ1bGsuYyBp bmRleA0KPiA+IDRjMTA0NTYuLjRiMzU3YjIgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9jbGsv Y2xrLWJ1bGsuYw0KPiA+ICsrKyBiL2RyaXZlcnMvY2xrL2Nsay1idWxrLmMNCj4gPiBAQCAtMTks NiArMTksMzggQEANCj4gPiAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiA+ICAjaW5jbHVkZSA8 bGludXgvZGV2aWNlLmg+DQo+ID4gICNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4NCj4gPiArI2lu Y2x1ZGUgPGxpbnV4L29mLmg+DQo+ID4gKw0KPiA+ICsjaWYgZGVmaW5lZChDT05GSUdfT0YpICYm IGRlZmluZWQoQ09ORklHX0NPTU1PTl9DTEspDQo+IA0KPiBEbyB3ZSBuZWVkIHRoZXNlIGRlZmlu ZXM/IG9mX2Nsa19nZXQoKSBpcyBhIHN0dWIgZnVuY3Rpb24gd2hlbiB0aGVzZQ0KPiBjb25maWdz IGFyZSBmYWxzZS4NCj4gDQoNCllvdSdyZSByaWdodC4gV2lsbCBkcm9wIGl0Lg0KDQo+ID4gK3N0 YXRpYyBpbnQgX19tdXN0X2NoZWNrIG9mX2Nsa19idWxrX2dldChzdHJ1Y3QgZGV2aWNlX25vZGUg Km5wLCBpbnQNCj4gbnVtX2Nsa3MsDQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cnVjdCBjbGtfYnVsa19kYXRhICpjbGtzKSB7DQo+ID4gKyAgICAgICBpbnQg cmV0Ow0KPiA+ICsgICAgICAgaW50IGk7DQo+ID4gKw0KPiA+ICsgICAgICAgZm9yIChpID0gMDsg aSA8IG51bV9jbGtzOyBpKyspDQo+ID4gKyAgICAgICAgICAgICAgIGNsa3NbaV0uY2xrID0gTlVM TDsNCj4gPiArDQo+ID4gKyAgICAgICBmb3IgKGkgPSAwOyBpIDwgbnVtX2Nsa3M7IGkrKykgew0K PiA+ICsgICAgICAgICAgICAgICBjbGtzW2ldLmNsayA9IG9mX2Nsa19nZXQobnAsIGkpOw0KPiA+ ICsgICAgICAgICAgICAgICBpZiAoSVNfRVJSKGNsa3NbaV0uY2xrKSkgew0KPiA+ICsgICAgICAg ICAgICAgICAgICAgICAgIHJldCA9IFBUUl9FUlIoY2xrc1tpXS5jbGspOw0KPiA+ICsgICAgICAg ICAgICAgICAgICAgICAgIHByX2VycigiJXBPRjogRmFpbGVkIHRvIGdldCBjbGsgaW5kZXg6ICVk IHJldDogJWRcbiIsDQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5wLCBpLCBy ZXQpOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgIGNsa3NbaV0uY2xrID0gTlVMTDsNCj4g PiArICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGVycjsNCj4gPiArICAgICAgICAgICAgICAg fQ0KPiA+ICsgICAgICAgfQ0KPiA+ICsNCj4gPiArICAgICAgIHJldHVybiAwOw0KPiA+ICsNCj4g PiArZXJyOg0KPiA+ICsgICAgICAgY2xrX2J1bGtfcHV0KGksIGNsa3MpOw0KPiA+ICsNCj4gPiAr ICAgICAgIHJldHVybiByZXQ7DQo+ID4gK30NCj4gPiArRVhQT1JUX1NZTUJPTChvZl9jbGtfYnVs a19nZXQpOw0KPiANCj4gSXQncyBzdGF0aWMsIHNvIGRvbid0IGV4cG9ydCBpdC4NCg0KR290IGl0 Lg0KU29ycnkgZm9yIHN1Y2ggbWlzdGFrZS4NCg0KV2lsbCBmaXggYW5kIHNlbnQgVjMuDQoNClJl Z2FyZHMNCkRvbmcgQWlzaGVuZw0K -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c index 4c10456..4b357b2 100644 --- a/drivers/clk/clk-bulk.c +++ b/drivers/clk/clk-bulk.c @@ -19,6 +19,38 @@ #include <linux/clk.h> #include <linux/device.h> #include <linux/export.h> +#include <linux/of.h> + +#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) +static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, + struct clk_bulk_data *clks) +{ + int ret; + int i; + + for (i = 0; i < num_clks; i++) + clks[i].clk = NULL; + + for (i = 0; i < num_clks; i++) { + clks[i].clk = of_clk_get(np, i); + if (IS_ERR(clks[i].clk)) { + ret = PTR_ERR(clks[i].clk); + pr_err("%pOF: Failed to get clk index: %d ret: %d\n", + np, i, ret); + clks[i].clk = NULL; + goto err; + } + } + + return 0; + +err: + clk_bulk_put(i, clks); + + return ret; +} +EXPORT_SYMBOL(of_clk_bulk_get); +#endif void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) {
'clock-names' property is optional in DT, so of_clk_bulk_get() is introduced here to handle this for DT users without 'clock-names' specified. Later clk_bulk_get_all() will be implemented on top of it and this API will be kept private until someone proves they need it because they don't have a struct device pointer. Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Russell King <linux@arm.linux.org.uk> Reported-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> --- drivers/clk/clk-bulk.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)