Commit 4a4ff4c5 authored by Laurent Vivier's avatar Laurent Vivier Committed by Michael Tokarev
Browse files

Remove unnecessary variables for function return value 



Re-run Coccinelle script scripts/coccinelle/return_directly.cocci

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
ppc part
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent f23c8107

accel/tcg/translate-all.c

+1 −4
Original line number Diff line number Diff line
@@ -644,11 +644,8 @@ static inline void *alloc_code_gen_buffer(void) 
static inline void *alloc_code_gen_buffer(void)

{

    size_t size = tcg_ctx->code_gen_buffer_size;

    void *buf;



    buf = VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT,

    return VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT,

                        PAGE_EXECUTE_READWRITE);

    return buf;

}

#else

static inline void *alloc_code_gen_buffer(void)

block/quorum.c

+2 −4
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static void read_quorum_children_entry(void *opaque) 
static int read_quorum_children(QuorumAIOCB *acb)

{

    BDRVQuorumState *s = acb->bs->opaque;

    int i, ret;

    int i;



    acb->children_read = s->num_children;

    for (i = 0; i < s->num_children; i++) {
@@ -648,9 +648,7 @@ static int read_quorum_children(QuorumAIOCB *acb) 
        qemu_coroutine_yield();

    }



    ret = acb->vote_ret;



    return ret;

    return acb->vote_ret;

}



static int read_fifo_child(QuorumAIOCB *acb)

hw/arm/exynos4210.c

+1 −5
Original line number Diff line number Diff line
@@ -156,12 +156,8 @@ void exynos4210_write_secondary(ARMCPU *cpu, 


static uint64_t exynos4210_calc_affinity(int cpu)

{

    uint64_t mp_affinity;



    /* Exynos4210 has 0x9 as cluster ID */

    mp_affinity = (0x9 << ARM_AFF1_SHIFT) | cpu;



    return mp_affinity;

    return (0x9 << ARM_AFF1_SHIFT) | cpu;

}



Exynos4210State *exynos4210_init(MemoryRegion *system_mem)

hw/block/vhost-user-blk.c

+1 −4
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev, 
                                            Error **errp)

{

    VHostUserBlk *s = VHOST_USER_BLK(vdev);

    uint64_t get_features;



    /* Turn on pre-defined features */

    virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
@@ -215,9 +214,7 @@ static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev, 
        virtio_add_feature(&features, VIRTIO_BLK_F_MQ);

    }



    get_features = vhost_get_features(&s->dev, user_feature_bits, features);



    return get_features;

    return vhost_get_features(&s->dev, user_feature_bits, features);

}



static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)

hw/hppa/dino.c

+1 −4
Original line number Diff line number Diff line
@@ -403,13 +403,10 @@ static void dino_set_irq(void *opaque, int irq, int level) 
static int dino_pci_map_irq(PCIDevice *d, int irq_num)

{

    int slot = d->devfn >> 3;

    int local_irq;



    assert(irq_num >= 0 && irq_num <= 3);



    local_irq = slot & 0x03;



    return local_irq;

    return slot & 0x03;

}



static void dino_set_timer_irq(void *opaque, int irq, int level)