lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 051/271] crypto: crypto4xx - Fix wrong ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
    Date
    From: Corentin Labbe <clabbe@baylibre.com>

    [ Upstream commit 6e88098ca43a3d80ae86908f7badba683c8a0d84 ]

    When building without CONFIG_HW_RANDOM_PPC4XX, I hit the following build failure:
    drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_probe':
    drivers/crypto/amcc/crypto4xx_core.c:1407:20: error: passing argument 1 of 'ppc4xx_trng_probe' from incompatible pointer type [-Werror=incompatible-pointer-types]
    In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
    drivers/crypto/amcc/crypto4xx_trng.h:28:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
    drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_remove':
    drivers/crypto/amcc/crypto4xx_core.c:1434:21: error: passing argument 1 of 'ppc4xx_trng_remove' from incompatible pointer type [-Werror=incompatible-pointer-types]
    In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
    drivers/crypto/amcc/crypto4xx_trng.h:30:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'

    This patch fix the needed argument of ppc4xx_trng_probe()/ppc4xx_trng_remove() in that case.

    Fixes: 5343e674f32f ("crypto4xx: integrate ppc4xx-rng into crypto4xx")
    Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/amcc/crypto4xx_trng.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/crypto/amcc/crypto4xx_trng.h b/drivers/crypto/amcc/crypto4xx_trng.h
    index 931d22531f515..7bbda51b7337c 100644
    --- a/drivers/crypto/amcc/crypto4xx_trng.h
    +++ b/drivers/crypto/amcc/crypto4xx_trng.h
    @@ -26,9 +26,9 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev);
    void ppc4xx_trng_remove(struct crypto4xx_core_device *core_dev);
    #else
    static inline void ppc4xx_trng_probe(
    - struct crypto4xx_device *dev __maybe_unused) { }
    + struct crypto4xx_core_device *dev __maybe_unused) { }
    static inline void ppc4xx_trng_remove(
    - struct crypto4xx_device *dev __maybe_unused) { }
    + struct crypto4xx_core_device *dev __maybe_unused) { }
    #endif

    #endif
    --
    2.20.1


    \
     
     \ /
      Last update: 2022-09-17 16:07    [W:4.019 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site