From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Turquette Subject: Re: [PATCH V2 3/3] ARM: OMAP2+: clk: Fix return type of callbacks Date: Fri, 21 Jun 2013 11:13:33 -0700 Message-ID: <20130621181333.20448.23218@quantum> References: <1371458384-23936-1-git-send-email-ambresh@ti.com> <1371458384-23936-4-git-send-email-ambresh@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1371458384-23936-4-git-send-email-ambresh@ti.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org Cc: Nishanth Menon , Paul Walmsley , Tony Lindgren , Rajendra , linux-kernel@vger.kernel.org, Tero Kristo , Ambresh K , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org UXVvdGluZyBBbWJyZXNoIEsgKDIwMTMtMDYtMTcgMDE6Mzk6NDQpCj4gRnJvbTogQW1icmVzaCBL IDxhbWJyZXNoQHRpLmNvbT4KPiAKPiBjbGtfb3BzJ3MgLmdldF9wYXJlbnQgbWVtYmVyIGRhdGEg cmV0dXJuJ3Mgc2lnbmVkIHZhbHVlLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEFtYnJlc2ggSyA8YW1i cmVzaEB0aS5jb20+CgpVbnN1cnByaXNpbmdseSBJIGdldCB0aGUgZm9sbG93aW5nIGVycm9ycyB3 aGVuIGJ1aWxkaW5nCm11bHRpX3Y3X2RlZmNvbmZpZzoKCmRyaXZlcnMvY2xrL2Nsay1jb21wb3Np dGUuYzogSW4gZnVuY3Rpb24g4oCYY2xrX3JlZ2lzdGVyX2NvbXBvc2l0ZeKAmToKZHJpdmVycy9j bGsvY2xrLWNvbXBvc2l0ZS5jOjE0ODozMzogd2FybmluZzogYXNzaWdubWVudCBmcm9tIGluY29t cGF0aWJsZSBwb2ludGVyIHR5cGUgW2VuYWJsZWQgYnkgZGVmYXVsdF0KZHJpdmVycy9jbGsvY2xr LXByaW1hMi5jOjQxMToyOiB3YXJuaW5nOiBpbml0aWFsaXphdGlvbiBmcm9tIGluY29tcGF0aWJs ZSBwb2ludGVyIHR5cGUgW2VuYWJsZWQgYnkgZGVmYXVsdF0KZHJpdmVycy9jbGsvY2xrLXByaW1h Mi5jOjQxMToyOiB3YXJuaW5nOiAobmVhciBpbml0aWFsaXphdGlvbiBmb3Ig4oCYbXNpX29wcy5n ZXRfcGFyZW504oCZKSBbZW5hYmxlZCBieSBkZWZhdWx0XQpkcml2ZXJzL2Nsay9jbGstcHJpbWEy LmM6NDU5OjI6IHdhcm5pbmc6IGluaXRpYWxpemF0aW9uIGZyb20gaW5jb21wYXRpYmxlIHBvaW50 ZXIgdHlwZSBbZW5hYmxlZCBieSBkZWZhdWx0XQpkcml2ZXJzL2Nsay9jbGstcHJpbWEyLmM6NDU5 OjI6IHdhcm5pbmc6IChuZWFyIGluaXRpYWxpemF0aW9uIGZvciDigJhjcHVfb3BzLmdldF9wYXJl bnTigJkpIFtlbmFibGVkIGJ5IGRlZmF1bHRdCmRyaXZlcnMvY2xrL2Nsay1wcmltYTIuYzo0ODU6 Mjogd2FybmluZzogaW5pdGlhbGl6YXRpb24gZnJvbSBpbmNvbXBhdGlibGUgcG9pbnRlciB0eXBl IFtlbmFibGVkIGJ5IGRlZmF1bHRdCmRyaXZlcnMvY2xrL2Nsay1wcmltYTIuYzo0ODU6Mjogd2Fy bmluZzogKG5lYXIgaW5pdGlhbGl6YXRpb24gZm9yIOKAmGRtbl9vcHMuZ2V0X3BhcmVudOKAmSkg W2VuYWJsZWQgYnkgZGVmYXVsdF0KZHJpdmVycy9jbGsvY2xrLXp5bnEuYzoxMTg6Mjogd2Fybmlu ZzogaW5pdGlhbGl6YXRpb24gZnJvbSBpbmNvbXBhdGlibGUgcG9pbnRlciB0eXBlIFtlbmFibGVk IGJ5IGRlZmF1bHRdCmRyaXZlcnMvY2xrL2Nsay16eW5xLmM6MTE4OjI6IHdhcm5pbmc6IChuZWFy IGluaXRpYWxpemF0aW9uIGZvciDigJh6eW5xX3BlcmlwaF9jbGtfb3BzLmdldF9wYXJlbnTigJkp IFtlbmFibGVkIGJ5IGRlZmF1bHRdCmRyaXZlcnMvY2xrL2Nsay16eW5xLmM6MjI4OjI6IHdhcm5p bmc6IGluaXRpYWxpemF0aW9uIGZyb20gaW5jb21wYXRpYmxlIHBvaW50ZXIgdHlwZSBbZW5hYmxl ZCBieSBkZWZhdWx0XQpkcml2ZXJzL2Nsay9jbGstenlucS5jOjIyODoyOiB3YXJuaW5nOiAobmVh ciBpbml0aWFsaXphdGlvbiBmb3Ig4oCYenlucV9jcHVfY2xrX29wcy5nZXRfcGFyZW504oCZKSBb ZW5hYmxlZCBieSBkZWZhdWx0XQoKQWxsIGRlZmluaXRpb25zIG9mIC5nZXRfcGFyZW50IGNhbGxi YWNrcyBuZWVkIHRvIGJlIHVwZGF0ZWQsIG5vdCBqdXN0CnlvdXIgcGxhdGZvcm0gb2YgY2hvaWNl LiBBbmQgdGhlcmUgbWF5IHdlbGwgYmUgbW9yZSB0aGFuIHRoZSBvbmVzIGFib3ZlLgoKSSdtIG5v dCB0YWtpbmcgdGhpcyBzZXJpZXMgZm9yIDMuMTEuIEFmdGVyIHRoZSBtZXJnZSB3aW5kb3cgY2Fu IHlvdQpyZXN1Ym1pdCB0aGlzIHNlcmllcyB3aXRoIGZpeGVzIGZvciBhbGwgb2YgdGhlIC5nZXRf cGFyZW50IGRlZmluaXRpb25zPwpOb3QganVzdCBmb3IgT01BUC4KCk90aGVyd2lzZSB0aGUgcmVz dCBvZiB0aGUgc2VyaWVzIGxvb2tzIGdvb2QgYW5kIEknbGwgYmUgaGFwcHkgdG8gdGFrZQp0aGlz IGluIHRvd2FyZHMgMy4xMi4KClRoYW5rcywKTWlrZQoKPiAtLS0KPiAgYXJjaC9hcm0vbWFjaC1v bWFwMi9jbGt0X2Nsa3NlbC5jIHwgICAgMiArLQo+ICBhcmNoL2FybS9tYWNoLW9tYXAyL2Nsa3Rf ZHBsbC5jICAgfCAgICAyICstCj4gIGFyY2gvYXJtL21hY2gtb21hcDIvY2xvY2suaCAgICAgICB8 ICAgIDQgKystLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1vbWFwMi9jbGt0X2Nsa3NlbC5j IGIvYXJjaC9hcm0vbWFjaC1vbWFwMi9jbGt0X2Nsa3NlbC5jCj4gaW5kZXggMGVjOWY2Zi4uMjc3 MzY1NyAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAyL2Nsa3RfY2xrc2VsLmMKPiAr KysgYi9hcmNoL2FybS9tYWNoLW9tYXAyL2Nsa3RfY2xrc2VsLmMKPiBAQCAtMzAzLDcgKzMwMyw3 IEBAIHUzMiBvbWFwMl9jbGtzZWxfcm91bmRfcmF0ZV9kaXYoc3RydWN0IGNsa19od19vbWFwICpj bGssCj4gICAqIHdheSB0byByZXR1cm4gYW4gZXJyb3IsIHNvIGlmIHdlIGVuY291bnRlciBhbiBl cnJvciwganVzdCBXQVJOKCkKPiAgICogYW5kIHByZXRlbmQgdGhhdCB3ZSBrbm93IHRoYXQgd2Un cmUgZG9pbmcuCj4gICAqLwo+IC11OCBvbWFwMl9jbGtzZWxfZmluZF9wYXJlbnRfaW5kZXgoc3Ry dWN0IGNsa19odyAqaHcpCj4gK2ludCBvbWFwMl9jbGtzZWxfZmluZF9wYXJlbnRfaW5kZXgoc3Ry dWN0IGNsa19odyAqaHcpCj4gIHsKPiAgICAgICAgIHN0cnVjdCBjbGtfaHdfb21hcCAqY2xrID0g dG9fY2xrX2h3X29tYXAoaHcpOwo+ICAgICAgICAgY29uc3Qgc3RydWN0IGNsa3NlbCAqY2xrczsK PiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1vbWFwMi9jbGt0X2RwbGwuYyBiL2FyY2gvYXJt L21hY2gtb21hcDIvY2xrdF9kcGxsLmMKPiBpbmRleCA5MjRjMjMwLi41NGI4YzQ5IDEwMDY0NAo+ IC0tLSBhL2FyY2gvYXJtL21hY2gtb21hcDIvY2xrdF9kcGxsLmMKPiArKysgYi9hcmNoL2FybS9t YWNoLW9tYXAyL2Nsa3RfZHBsbC5jCj4gQEAgLTE4Niw3ICsxODYsNyBAQCBzdGF0aWMgaW50IF9k cGxsX3Rlc3RfbXVsdChpbnQgKm0sIGludCBuLCB1bnNpZ25lZCBsb25nICpuZXdfcmF0ZSwKPiAg fQo+ICAKPiAgLyogUHVibGljIGZ1bmN0aW9ucyAqLwo+IC11OCBvbWFwMl9pbml0X2RwbGxfcGFy ZW50KHN0cnVjdCBjbGtfaHcgKmh3KQo+ICtpbnQgb21hcDJfaW5pdF9kcGxsX3BhcmVudChzdHJ1 Y3QgY2xrX2h3ICpodykKPiAgewo+ICAgICAgICAgc3RydWN0IGNsa19od19vbWFwICpjbGsgPSB0 b19jbGtfaHdfb21hcChodyk7Cj4gICAgICAgICB1MzIgdjsKPiBkaWZmIC0tZ2l0IGEvYXJjaC9h cm0vbWFjaC1vbWFwMi9jbG9jay5oIGIvYXJjaC9hcm0vbWFjaC1vbWFwMi9jbG9jay5oCj4gaW5k ZXggN2FhMzJjZC4uMjc4NDA4NyAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAyL2Ns b2NrLmgKPiArKysgYi9hcmNoL2FybS9tYWNoLW9tYXAyL2Nsb2NrLmgKPiBAQCAtMzg0LDcgKzM4 NCw3IEBAIHZvaWQgX19pbml0IG9tYXAyX2Nsa19kaXNhYmxlX2Nsa2RtX2NvbnRyb2wodm9pZCk7 Cj4gIHUzMiBvbWFwMl9jbGtzZWxfcm91bmRfcmF0ZV9kaXYoc3RydWN0IGNsa19od19vbWFwICpj bGssCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHRhcmdl dF9yYXRlLAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdTMyICpuZXdfZGl2KTsK PiAtdTggb21hcDJfY2xrc2VsX2ZpbmRfcGFyZW50X2luZGV4KHN0cnVjdCBjbGtfaHcgKmh3KTsK PiAraW50IG9tYXAyX2Nsa3NlbF9maW5kX3BhcmVudF9pbmRleChzdHJ1Y3QgY2xrX2h3ICpodyk7 Cj4gIHVuc2lnbmVkIGxvbmcgb21hcDJfY2xrc2VsX3JlY2FsYyhzdHJ1Y3QgY2xrX2h3ICpodywg dW5zaWduZWQgbG9uZyBwYXJlbnRfcmF0ZSk7Cj4gIGxvbmcgb21hcDJfY2xrc2VsX3JvdW5kX3Jh dGUoc3RydWN0IGNsa19odyAqaHcsIHVuc2lnbmVkIGxvbmcgdGFyZ2V0X3JhdGUsCj4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nICpwYXJlbnRfcmF0ZSk7Cj4g QEAgLTM5Niw3ICszOTYsNyBAQCBpbnQgb21hcDJfY2xrc2VsX3NldF9wYXJlbnQoc3RydWN0IGNs a19odyAqaHcsIHU4IGZpZWxkX3ZhbCk7Cj4gIGV4dGVybiB2b2lkIG9tYXAyX2Nsa3RfaWNsa19h bGxvd19pZGxlKHN0cnVjdCBjbGtfaHdfb21hcCAqY2xrKTsKPiAgZXh0ZXJuIHZvaWQgb21hcDJf Y2xrdF9pY2xrX2RlbnlfaWRsZShzdHJ1Y3QgY2xrX2h3X29tYXAgKmNsayk7Cj4gIAo+IC11OCBv bWFwMl9pbml0X2RwbGxfcGFyZW50KHN0cnVjdCBjbGtfaHcgKmh3KTsKPiAraW50IG9tYXAyX2lu aXRfZHBsbF9wYXJlbnQoc3RydWN0IGNsa19odyAqaHcpOwo+ICB1bnNpZ25lZCBsb25nIG9tYXAy X2dldF9kcGxsX3JhdGUoc3RydWN0IGNsa19od19vbWFwICpjbGspOwo+ICAKPiAgaW50IG9tYXAy X2RmbHRfY2xrX2VuYWJsZShzdHJ1Y3QgY2xrX2h3ICpodyk7Cj4gLS0gCj4gMS43LjQuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@linaro.org (Mike Turquette) Date: Fri, 21 Jun 2013 11:13:33 -0700 Subject: [PATCH V2 3/3] ARM: OMAP2+: clk: Fix return type of callbacks In-Reply-To: <1371458384-23936-4-git-send-email-ambresh@ti.com> References: <1371458384-23936-1-git-send-email-ambresh@ti.com> <1371458384-23936-4-git-send-email-ambresh@ti.com> Message-ID: <20130621181333.20448.23218@quantum> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Quoting Ambresh K (2013-06-17 01:39:44) > From: Ambresh K > > clk_ops's .get_parent member data return's signed value. > > Signed-off-by: Ambresh K Unsurprisingly I get the following errors when building multi_v7_defconfig: drivers/clk/clk-composite.c: In function ?clk_register_composite?: drivers/clk/clk-composite.c:148:33: warning: assignment from incompatible pointer type [enabled by default] drivers/clk/clk-prima2.c:411:2: warning: initialization from incompatible pointer type [enabled by default] drivers/clk/clk-prima2.c:411:2: warning: (near initialization for ?msi_ops.get_parent?) [enabled by default] drivers/clk/clk-prima2.c:459:2: warning: initialization from incompatible pointer type [enabled by default] drivers/clk/clk-prima2.c:459:2: warning: (near initialization for ?cpu_ops.get_parent?) [enabled by default] drivers/clk/clk-prima2.c:485:2: warning: initialization from incompatible pointer type [enabled by default] drivers/clk/clk-prima2.c:485:2: warning: (near initialization for ?dmn_ops.get_parent?) [enabled by default] drivers/clk/clk-zynq.c:118:2: warning: initialization from incompatible pointer type [enabled by default] drivers/clk/clk-zynq.c:118:2: warning: (near initialization for ?zynq_periph_clk_ops.get_parent?) [enabled by default] drivers/clk/clk-zynq.c:228:2: warning: initialization from incompatible pointer type [enabled by default] drivers/clk/clk-zynq.c:228:2: warning: (near initialization for ?zynq_cpu_clk_ops.get_parent?) [enabled by default] All definitions of .get_parent callbacks need to be updated, not just your platform of choice. And there may well be more than the ones above. I'm not taking this series for 3.11. After the merge window can you resubmit this series with fixes for all of the .get_parent definitions? Not just for OMAP. Otherwise the rest of the series looks good and I'll be happy to take this in towards 3.12. Thanks, Mike > --- > arch/arm/mach-omap2/clkt_clksel.c | 2 +- > arch/arm/mach-omap2/clkt_dpll.c | 2 +- > arch/arm/mach-omap2/clock.h | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-omap2/clkt_clksel.c b/arch/arm/mach-omap2/clkt_clksel.c > index 0ec9f6f..2773657 100644 > --- a/arch/arm/mach-omap2/clkt_clksel.c > +++ b/arch/arm/mach-omap2/clkt_clksel.c > @@ -303,7 +303,7 @@ u32 omap2_clksel_round_rate_div(struct clk_hw_omap *clk, > * way to return an error, so if we encounter an error, just WARN() > * and pretend that we know that we're doing. > */ > -u8 omap2_clksel_find_parent_index(struct clk_hw *hw) > +int omap2_clksel_find_parent_index(struct clk_hw *hw) > { > struct clk_hw_omap *clk = to_clk_hw_omap(hw); > const struct clksel *clks; > diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c > index 924c230..54b8c49 100644 > --- a/arch/arm/mach-omap2/clkt_dpll.c > +++ b/arch/arm/mach-omap2/clkt_dpll.c > @@ -186,7 +186,7 @@ static int _dpll_test_mult(int *m, int n, unsigned long *new_rate, > } > > /* Public functions */ > -u8 omap2_init_dpll_parent(struct clk_hw *hw) > +int omap2_init_dpll_parent(struct clk_hw *hw) > { > struct clk_hw_omap *clk = to_clk_hw_omap(hw); > u32 v; > diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h > index 7aa32cd..2784087 100644 > --- a/arch/arm/mach-omap2/clock.h > +++ b/arch/arm/mach-omap2/clock.h > @@ -384,7 +384,7 @@ void __init omap2_clk_disable_clkdm_control(void); > u32 omap2_clksel_round_rate_div(struct clk_hw_omap *clk, > unsigned long target_rate, > u32 *new_div); > -u8 omap2_clksel_find_parent_index(struct clk_hw *hw); > +int omap2_clksel_find_parent_index(struct clk_hw *hw); > unsigned long omap2_clksel_recalc(struct clk_hw *hw, unsigned long parent_rate); > long omap2_clksel_round_rate(struct clk_hw *hw, unsigned long target_rate, > unsigned long *parent_rate); > @@ -396,7 +396,7 @@ int omap2_clksel_set_parent(struct clk_hw *hw, u8 field_val); > extern void omap2_clkt_iclk_allow_idle(struct clk_hw_omap *clk); > extern void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk); > > -u8 omap2_init_dpll_parent(struct clk_hw *hw); > +int omap2_init_dpll_parent(struct clk_hw *hw); > unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk); > > int omap2_dflt_clk_enable(struct clk_hw *hw); > -- > 1.7.4.1