lkml.org 
[lkml]   [2015]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 4/4] crypto-ixp4xx: Less function calls in init_ixp_crypto() after error detection
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 15 Nov 2015 19:23:55 +0100

    The dma_pool_destroy() function was called in up to two cases by the
    init_ixp_crypto() function during error handling even if a call of
    the dma_pool_create() function failed.

    This implementation detail could be improved by the adjustment
    of jump targets according to the Linux coding style convention.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/crypto/ixp4xx_crypto.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
    index 97da36a..a2c3155 100644
    --- a/drivers/crypto/ixp4xx_crypto.c
    +++ b/drivers/crypto/ixp4xx_crypto.c
    @@ -483,23 +483,23 @@ static int init_ixp_crypto(struct device *dev)
    sizeof(struct buffer_desc), 32, 0);
    if (!buffer_pool) {
    ret = -ENOMEM;
    - goto err;
    + goto release_npe;
    }
    ctx_pool = dma_pool_create("context", dev,
    NPE_CTX_LEN, 16, 0);
    if (!ctx_pool) {
    ret = -ENOMEM;
    - goto err;
    + goto destroy_buffer_pool;
    }
    ret = qmgr_request_queue(SEND_QID, NPE_QLEN_TOTAL, 0, 0,
    "ixp_crypto:out", NULL);
    if (ret)
    - goto err;
    + goto destroy_ctx_pool;
    ret = qmgr_request_queue(RECV_QID, NPE_QLEN, 0, 0,
    "ixp_crypto:in", NULL);
    if (ret) {
    qmgr_release_queue(SEND_QID);
    - goto err;
    + goto destroy_ctx_pool;
    }
    qmgr_set_irq(RECV_QID, QUEUE_IRQ_SRC_NOT_EMPTY, irqhandler, NULL);
    tasklet_init(&crypto_done_tasklet, crypto_done_action, 0);
    @@ -511,8 +511,9 @@ npe_error:
    printk(KERN_ERR "%s not responding\n", npe_name(npe_c));
    ret = -EIO;
    goto release_npe;
    -err:
    +destroy_ctx_pool:
    dma_pool_destroy(ctx_pool);
    +destroy_buffer_pool:
    dma_pool_destroy(buffer_pool);
    release_npe:
    npe_release(npe_c);
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-11-15 20:01    [W:4.020 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site