Date: Fri, 17 Jul 2015 10:44:36 +0100
From: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>, Lee Jones <lee.jones@linaro.org>,
        Liam Girdwood <lgirdwood@gmail.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Richard Fitzgerald <rf@opensource.wolfsonmicro.com>,
        Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: Re: linux-next: build warnings after merge of the regmap tree
Message-ID: <20150717094436.GC21939@opensource.wolfsonmicro.com>
References: <20150717143934.4f0ce5d7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150717143934.4f0ce5d7@canb.auug.org.au>
User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 3742
Lines: 81

On Fri, Jul 17, 2015 at 02:39:34PM +1000, Stephen Rothwell wrote:
> Hi Mark,
> 
> After merging the regmap tree, today's linux-next build (powerpc
> allyesconfig) produced these warnings:
> 
> sound/soc/codecs/wm5110.c: In function 'wm5110_hp_pre_enable':
> sound/soc/codecs/wm5110.c:294:9: warning: passing argument 2 of 'regmap_multi_reg_write' from incompatible pointer type
>   return regmap_multi_reg_write(arizona->regmap, wseq, nregs);
>          ^
> In file included from sound/soc/codecs/wm5110.c:19:0:
> include/linux/regmap.h:427:5: note: expected 'const struct reg_sequence *' but argument is of type 'const struct reg_default *'
>  int regmap_multi_reg_write(struct regmap *map, const struct reg_sequence *regs,
>      ^
> sound/soc/codecs/wm5110.c: In function 'wm5110_clear_pga_volume':
> sound/soc/codecs/wm5110.c:362:8: warning: passing argument 2 of 'regmap_multi_reg_write_bypassed' from incompatible pointer type
>   ret = regmap_multi_reg_write_bypassed(arizona->regmap, &clear_pga, 1);
>         ^
> In file included from sound/soc/codecs/wm5110.c:19:0:
> include/linux/regmap.h:429:5: note: expected 'const struct reg_sequence *' but argument is of type 'struct reg_default *'
>  int regmap_multi_reg_write_bypassed(struct regmap *map,
>      ^
> drivers/mfd/wm5110-tables.c: In function 'wm5110_patch':
> drivers/mfd/wm5110-tables.c:279:10: warning: passing argument 2 of 'regmap_register_patch' from incompatible pointer type
>    return regmap_register_patch(arizona->regmap,
>           ^
> In file included from include/linux/mfd/arizona/core.h:17:0,
>                  from drivers/mfd/wm5110-tables.c:15:
> include/linux/regmap.h:469:5: note: expected 'const struct reg_sequence *' but argument is of type 'const struct reg_default *'
>  int regmap_register_patch(struct regmap *map, const struct reg_sequence *regs,
>      ^
> drivers/mfd/wm8998-tables.c: In function 'wm8998_patch':
> drivers/mfd/wm8998-tables.c:48:9: warning: passing argument 2 of 'regmap_register_patch' from incompatible pointer type
>   return regmap_register_patch(arizona->regmap,
>          ^
> In file included from include/linux/mfd/arizona/core.h:17:0,
>                  from drivers/mfd/wm8998-tables.c:15:
> include/linux/regmap.h:469:5: note: expected 'const struct reg_sequence *' but argument is of type 'const struct reg_default *'
>  int regmap_register_patch(struct regmap *map, const struct reg_sequence *regs,
>      ^
> 
> Introduced by commit
> 
>   8019ff6cfc04 ("regmap: Use reg_sequence for multi_reg_write / register_patch")
> 
> interacting with commit
> 
>   561629755a21 ("mfd: arizona: Add support for WM8998 and WM1814")
> 
> from the mfd tree and commits
> 
>   d1acd31883d7 ("ASoC: wm5110: Add special DRE on/off handling for the headphone path")
>   81207880cef2 ("mfd: wm5110: Add register patch for rev E and above")
> 
> from the sound-asoc tree.
> 
> I may make up a merge fix for these on Monday ... I love API changes :-(

Hi Stephen, Mark,

What is the best course of action here? I am more than happy to help with
whatever is needed but unsure of the etiquette here and also not sure
what I can do.

Clearly there are some clients that need updating but they were not
present in the regmap tree, so is the correct thing to do to merge
in the mfd and sound-asoc tree and provide a fixup commit?

Just let me know and I am happy to do whatever is deemed correct.

Thanks
Nariman 

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/