From nobody Fri Nov 14 06:36:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585760079; cv=none; d=zohomail.com; s=zohoarc; b=UbawYMMf9COZCcp3M9J6WeecRubI/O3D1+ps37Sy8y1iiVZNkixAhbG/Q5bltLqbmYyTrOkOPyJg9uavnM+9kEkx3eNYejf3bl8q7zZKZ5tgXw3hfV4Q0pF02CXmjS3HaOyK2Xg5aXhNqRJRr4zvY8s5YBL2NTb7+HdgvOA4t6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585760079; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=NehYya5xPuO3ZRBqwg80+l6DFfPA2NC5sbO9IhpiymM=; b=lb9YQs/7mhsyVloBlaySY8x7jSVZv5rc49NavSVeumCNyQS9VjPmw1MuifBO+1w1k70VS4q/bpLwQIxJH4IJmtIdUxxmYuFKJiNBlNlw2ZbBInA6ScdQ9TpETrUHWnbQJKxKdXFfe1pCWB5UGdirfl63azsVrkjbqbovcgurQGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585760079500480.82793837055294; Wed, 1 Apr 2020 09:54:39 -0700 (PDT) Received: from localhost ([::1]:34870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJgdS-0005Mb-5a for importer@patchew.org; Wed, 01 Apr 2020 12:54:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38325) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJgcf-0004ik-KD for qemu-devel@nongnu.org; Wed, 01 Apr 2020 12:53:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJgcd-00043U-Vt for qemu-devel@nongnu.org; Wed, 01 Apr 2020 12:53:49 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:46752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJgcd-000434-PV; Wed, 01 Apr 2020 12:53:47 -0400 Received: by mail-pg1-x542.google.com with SMTP id k191so316911pgc.13; Wed, 01 Apr 2020 09:53:47 -0700 (PDT) Received: from simran-Inspiron-5558 ([2409:4052:200f:7af7:4926:6e0b:60ca:635c]) by smtp.gmail.com with ESMTPSA id f64sm2030305pfb.72.2020.04.01.09.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2020 09:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=NehYya5xPuO3ZRBqwg80+l6DFfPA2NC5sbO9IhpiymM=; b=VKYf24KdySrJdjE9w7PKU+ZHacBVM2Nk5+gkq1rNr0c0EFycX/ZP2aS6OO80YnX33T tk42LdR656coVl5+qDRRZEW9YgZbmmzxBk5oG5+vJPHlEi8L5amuyDHzXnTzkHTOUlYG 8+rD7N5XjvZ+mVAj1zUfBf2nZ0RYy6uT9YZoESV1MJTJjyYnvZALNpDLo50nhnORbK9D CLUzBnVR419jiGCKu7f1/+NLYs7rEccSOcesijFloZU+Xg51M/9JGZaJCUG9V1N2xRKQ zrsOVkttYqz90k6t2QZB6aChvkN88KySYjf9HGTB1SiZpE0sY4i3qLVwn9ulliY4Jw45 rMCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=NehYya5xPuO3ZRBqwg80+l6DFfPA2NC5sbO9IhpiymM=; b=Ql+y4GJh54esufjmsxzr96l1yvGyJwz+CMnErDIG+Z4LK7LLskDMBUMmosg4t521UC hxk0tGFgchxIqbOWrGfL/k3o2gF2f1NtonO/Lvqg65yAqVJlY4W7WkEm9VASssmsE7FK oq1CcUplwSU/l2ZcxpUJNVKRGQ3JyamqlSwQLlweUmWNQBbxZY03B7UilXRtWSKifbqM E1BFqL1dy4j4v5aLPYsvTi0DU/Rc94IY8QsEoOJbKTLNIMRVvjqkHXfeQjvRrBtEUjZb N5KIxzVVBlwTJ4UG3jhOvbmR5zeE0LC28FG342lqYUWKR8XA0RGoeHEtTIAdD4M88Paa 6Zrg== X-Gm-Message-State: AGi0Puazzqi5qIC8r1hpZoPn7ZeNvMBdM+Kxxl4lfQEXFWgYVlyOB27N e9yJZ+mJETRYCe0ajda2zFA= X-Google-Smtp-Source: APiQypLW7putp3YDEa/vAt59wrNhdIS4hrYdSiaNNIn4Z/8qtrMVcjhu6SZPdJ9lioT6gMQudfLlog== X-Received: by 2002:a63:ee0b:: with SMTP id e11mr10252630pgi.80.1585760026599; Wed, 01 Apr 2020 09:53:46 -0700 (PDT) Date: Wed, 1 Apr 2020 22:23:14 +0530 From: Simran Singhal To: qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2] Compress lines for immediate return Message-ID: <20200401165314.GA3213@simran-Inspiron-5558> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= , Juan Quintela , Jeff Cody , Stefan Hajnoczi , Peter Lieven , "Dr. David Alan Gilbert" , Max Reitz , Gerd Hoffmann , Julia Suvorova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Compress two lines into a single line if immediate return statement is foun= d. It also remove variables progress, val, data, ret and sock as they are no longer needed. Remove space between function "mixer_load" and '(' to fix the checkpatch.pl error:- ERROR: space prohibited between function name and open parenthesis '(' Done using following coccinelle script: @@ local idexpression ret; expression e; @@ -ret =3D +return e; -return ret; Signed-off-by: Simran Singhal Reviewed-by: Stefan Hajnoczi --- Changes in v2: -Added coccinelle script wrote for changes in commit message. block/file-posix.c | 3 +-- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/cirrus_vga.c | 4 +--- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 10 files changed, 10 insertions(+), 28 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 7e19bbff5f..dc01f0d4d3 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1627,8 +1627,7 @@ static int handle_aiocb_write_zeroes_unmap(void *opaq= ue) =20 /* If we couldn't manage to unmap while guaranteed that the area reads= as * all-zero afterwards, just write zeroes without unmapping */ - ret =3D handle_aiocb_write_zeroes(aiocb); - return ret; + return handle_aiocb_write_zeroes(aiocb); } =20 #ifndef HAVE_COPY_FILE_RANGE diff --git a/block/nfs.c b/block/nfs.c index cc2413d5ab..100f15bd1f 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -623,8 +623,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *o= ptions, int flags, } =20 bs->total_sectors =3D ret; - ret =3D 0; - return ret; + return 0; } =20 static QemuOptsList nfs_create_opts =3D { diff --git a/block/nvme.c b/block/nvme.c index 7b7c0cc5d6..eb2f54dd9d 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -575,11 +575,9 @@ static bool nvme_poll_cb(void *opaque) { EventNotifier *e =3D opaque; BDRVNVMeState *s =3D container_of(e, BDRVNVMeState, irq_notifier); - bool progress =3D false; =20 trace_nvme_poll_cb(s); - progress =3D nvme_poll_queues(s); - return progress; + return nvme_poll_queues(s); } =20 static int nvme_init(BlockDriverState *bs, const char *device, int namespa= ce, diff --git a/block/vhdx.c b/block/vhdx.c index 33e57cd656..2c0e7ee44d 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -411,8 +411,7 @@ int vhdx_update_headers(BlockDriverState *bs, BDRVVHDXS= tate *s, if (ret < 0) { return ret; } - ret =3D vhdx_update_header(bs, s, generate_data_write_guid, log_guid); - return ret; + return vhdx_update_header(bs, s, generate_data_write_guid, log_guid); } =20 /* opens the specified header block from the VHDX file header section */ diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 1ec87feec0..8a9b9924c4 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -573,11 +573,9 @@ static uint32_t nam_readb (void *opaque, uint32_t addr) static uint32_t nam_readw (void *opaque, uint32_t addr) { AC97LinkState *s =3D opaque; - uint32_t val =3D ~0U; uint32_t index =3D addr; s->cas =3D 0; - val =3D mixer_load (s, index); - return val; + return mixer_load(s, index); } =20 static uint32_t nam_readl (void *opaque, uint32_t addr) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index d6c1fb0586..7c3b67dcfb 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -120,13 +120,10 @@ static void adlib_write(void *opaque, uint32_t nport,= uint32_t val) static uint32_t adlib_read(void *opaque, uint32_t nport) { AdlibState *s =3D opaque; - uint8_t data; int a =3D nport & 3; =20 adlib_kill_timers (s); - data =3D OPLRead (s->opl, a); - - return data; + return OPLRead (s->opl, a); } =20 static void timer_handler (void *opaque, int c, double interval_Sec) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 0d391e1300..1f29731ffe 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2411,12 +2411,10 @@ static uint64_t cirrus_linear_bitblt_read(void *opa= que, unsigned size) { CirrusVGAState *s =3D opaque; - uint32_t ret; =20 /* XXX handle bitblt */ (void)s; - ret =3D 0xff; - return ret; + return 0xff; } =20 static void cirrus_linear_bitblt_write(void *opaque, diff --git a/migration/ram.c b/migration/ram.c index 04f13feb2e..06cba88632 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2135,9 +2135,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *= ms) } trace_ram_postcopy_send_discard_bitmap(); =20 - ret =3D postcopy_each_ram_send_discard(ms); - - return ret; + return postcopy_each_ram_send_discard(ms); } =20 /** diff --git a/ui/gtk.c b/ui/gtk.c index 030b251c61..83f2f5d49b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1650,8 +1650,7 @@ static GSList *gd_vc_menu_init(GtkDisplayState *s, Vi= rtualConsole *vc, G_CALLBACK(gd_menu_switch_vc), s); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), vc->menu_item); =20 - group =3D gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_i= tem)); - return group; + return gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_item= )); } =20 #if defined(CONFIG_VTE) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index bcc06d0e01..86c48b9fa5 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -765,15 +765,12 @@ static int vsock_connect_addr(const struct sockaddr_v= m *svm, Error **errp) static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp) { struct sockaddr_vm svm; - int sock =3D -1; =20 if (!vsock_parse_vaddr_to_sockaddr(vaddr, &svm, errp)) { return -1; } =20 - sock =3D vsock_connect_addr(&svm, errp); - - return sock; + return vsock_connect_addr(&svm, errp); } =20 static int vsock_listen_saddr(VsockSocketAddress *vaddr, --=20 2.17.1