From mboxrd@z Thu Jan  1 00:00:00 1970
From: pdeschrijver@nvidia.com (Peter De Schrijver)
Date: Mon, 4 Feb 2013 12:37:56 +0200
Subject: [PATCH v5 04/10] clk: tegra: Add new fields and PLL types for
 Tegra114
In-Reply-To: <510F56B1.5060409@nvidia.com>
References: <1359713962-16822-1-git-send-email-pdeschrijver@nvidia.com>
 <1359713962-16822-5-git-send-email-pdeschrijver@nvidia.com>
 <510C1A2E.5010408@nvidia.com> <510F56B1.5060409@nvidia.com>
Message-ID: <20130204103756.GP2364@tbergstrom-lnx.Nvidia.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Mon, Feb 04, 2013 at 07:35:29AM +0100, Prashant Gaikwad wrote:
> On Saturday 02 February 2013 01:10 AM, Rhyland Klein wrote:
> > On 2/1/2013 5:18 AM, Peter De Schrijver wrote:
> >> Tegra114 introduces new PLL types. This requires new clocktypes as well
> >> as some new fields in the pll structure.
> >>
> >> Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
> >> ---
> >>    drivers/clk/tegra/clk-pll.c |  719 +++++++++++++++++++++++++++++++++++++++++++
> >>    drivers/clk/tegra/clk.h     |   47 +++
> >>    2 files changed, 766 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
> >> index 87d2f34..50114b7 100644
> >> --- a/drivers/clk/tegra/clk-pll.c
> >> +++ b/drivers/clk/tegra/clk-pll.c
> >> [snip]
> >> +struct clk *tegra_clk_register_pllxc(const char *name, const char *parent_name,
> >> +                         void __iomem *clk_base, void __iomem *pmc,
> >> +                         unsigned long flags, unsigned long fixed_rate,
> >> +                         struct tegra_clk_pll_params *pll_params,
> >> +                         u32 pll_flags,
> >> +                         struct tegra_clk_pll_freq_table *freq_table,
> >> +                         spinlock_t *lock)
> >> +{
> >> +       if (!pll_params->pdiv_tohw)
> >> +               return -EINVAL;
> >> +
> > This will cause the following warning:
> > warning: return makes pointer from integer without a cast
> >
> > Same with occurrences in tegra_clk_register_pllm and
> > tegra_clk_register_pllc.
> >
> > Should this instead be returning NULL?
> 
> return ERR_PTR(-EINVAL)
> 

Indeed. I noticed that only after I sent this patchset. Already fixed in
my own tree.

Cheers,

Peter.