On Tue, Aug 16, 2016 at 08:26:20AM +0200, Christophe Leroy wrote:
> fixes: 0e6e01ff694ee ("CPM/QE: use genalloc to manage CPM/QE muram")
> Cc: sta...@vger.linux.org
> Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
[snip]
> muram_pbase = of_translate_address(np, zero);
> if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
> - pr_err("Cannot translate zero through CPM muram node");
> + pr_err("Cannot translate zero through CPM/QE muram node");
> ret = -ENODEV;
> goto out_pool;
> }
> @@ -83,14 +88,14 @@ int cpm_muram_init(void)
> ret = gen_pool_add(muram_pool, r.start - muram_pbase +
> GENPOOL_OFFSET, resource_size(&r), -1);
> if (ret) {
> - pr_err("QE: couldn't add muram to pool!\n");
> + pr_err("CPM/QE: couldn't add muram to pool!\n");
> goto out_pool;
> }
> }
>
> muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
> if (!muram_vbase) {
> - pr_err("Cannot map QE muram");
> + pr_err("Cannot map CPM/QE muram");
> ret = -ENOMEM;
> goto out_pool;
> }
These string changes are not related to the bugfix. Particularly since
this is aimed at stable, I'm removing this part of the patch when
applying.
-Scott
