diff mbox

crypto: mv_cesa - fix up for of_get_named_gen_pool() rename

Message ID 1435221470-5382-1-git-send-email-simon.guinot@sequanux.org (mailing list archive)
State Rejected
Delegated to: Herbert Xu
Headers show

Commit Message

Simon Guinot June 25, 2015, 8:37 a.m. UTC
This patch fixes the following build error:

drivers/crypto/mv_cesa.c: In function 'mv_cesa_get_sram':
drivers/crypto/mv_cesa.c:1037: error: implicit declaration of function 'of_get_named_gen_pool'
drivers/crypto/mv_cesa.c:1038: warning: assignment makes pointer from integer without a cast
scripts/Makefile.build:258: recipe for target 'drivers/crypto/mv_cesa.o' failed

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
 drivers/crypto/mv_cesa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Herbert Xu June 25, 2015, 3:30 p.m. UTC | #1
On Thu, Jun 25, 2015 at 10:37:50AM +0200, Simon Guinot wrote:
> This patch fixes the following build error:
> 
> drivers/crypto/mv_cesa.c: In function 'mv_cesa_get_sram':
> drivers/crypto/mv_cesa.c:1037: error: implicit declaration of function 'of_get_named_gen_pool'
> drivers/crypto/mv_cesa.c:1038: warning: assignment makes pointer from integer without a cast
> scripts/Makefile.build:258: recipe for target 'drivers/crypto/mv_cesa.o' failed
> 
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>

This patch doesn't compile.
Paul Gortmaker June 25, 2015, 3:41 p.m. UTC | #2
On Thu, Jun 25, 2015 at 11:30 AM, Herbert Xu
<herbert@gondor.apana.org.au> wrote:
> On Thu, Jun 25, 2015 at 10:37:50AM +0200, Simon Guinot wrote:
>> This patch fixes the following build error:
>>
>> drivers/crypto/mv_cesa.c: In function 'mv_cesa_get_sram':
>> drivers/crypto/mv_cesa.c:1037: error: implicit declaration of function 'of_get_named_gen_pool'
>> drivers/crypto/mv_cesa.c:1038: warning: assignment makes pointer from integer without a cast
>> scripts/Makefile.build:258: recipe for target 'drivers/crypto/mv_cesa.o' failed
>>
>> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
>
> This patch doesn't compile.

As sfr pointed out, this is an interaction with a rename patch in
the akpm tree; sfr added a fixup patch here last night:

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?h=akpm

"crypto: marvell/cesa - another fix up for of_get_named_gen_pool() rename"

Paul.
--

> --
> Email: Herbert Xu <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Guinot June 25, 2015, 3:56 p.m. UTC | #3
On Thu, Jun 25, 2015 at 11:30:06PM +0800, Herbert Xu wrote:
> On Thu, Jun 25, 2015 at 10:37:50AM +0200, Simon Guinot wrote:
> > This patch fixes the following build error:
> > 
> > drivers/crypto/mv_cesa.c: In function 'mv_cesa_get_sram':
> > drivers/crypto/mv_cesa.c:1037: error: implicit declaration of function 'of_get_named_gen_pool'
> > drivers/crypto/mv_cesa.c:1038: warning: assignment makes pointer from integer without a cast
> > scripts/Makefile.build:258: recipe for target 'drivers/crypto/mv_cesa.o' failed
> > 
> > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> 
> This patch doesn't compile.

It does compile. How it could not ?
But since the issue has already been fixed, it doesn't really matter.

Simon
Herbert Xu June 26, 2015, 8:32 a.m. UTC | #4
On Thu, Jun 25, 2015 at 05:56:05PM +0200, Simon Guinot wrote:
> On Thu, Jun 25, 2015 at 11:30:06PM +0800, Herbert Xu wrote:
> > On Thu, Jun 25, 2015 at 10:37:50AM +0200, Simon Guinot wrote:
> > > This patch fixes the following build error:
> > > 
> > > drivers/crypto/mv_cesa.c: In function 'mv_cesa_get_sram':
> > > drivers/crypto/mv_cesa.c:1037: error: implicit declaration of function 'of_get_named_gen_pool'
> > > drivers/crypto/mv_cesa.c:1038: warning: assignment makes pointer from integer without a cast
> > > scripts/Makefile.build:258: recipe for target 'drivers/crypto/mv_cesa.o' failed
> > > 
> > > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> > 
> > This patch doesn't compile.
> 
> It does compile. How it could not ?
> But since the issue has already been fixed, it doesn't really matter.

It breaks the build of mv_cesa in the crypto tree as well as the
cryptodev tree while without your patch the mv_cesa builds just
fine.  If your patch isn't meant for these trees then you should
clearly say so.

Thanks,
diff mbox

Patch

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 5bcd575fa96f..e6b658faef63 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -1034,8 +1034,8 @@  static int mv_cesa_get_sram(struct platform_device *pdev,
 			     &sram_size);
 
 	cp->sram_size = sram_size;
-	cp->sram_pool = of_get_named_gen_pool(pdev->dev.of_node,
-					      "marvell,crypto-srams", 0);
+	cp->sram_pool = of_gen_pool_get(pdev->dev.of_node,
+					"marvell,crypto-srams", 0);
 	if (cp->sram_pool) {
 		cp->sram = gen_pool_dma_alloc(cp->sram_pool, sram_size,
 					      &cp->sram_dma);