From nobody Tue Feb 10 01:34:55 2026 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1593524453; cv=none; d=zohomail.com; s=zohoarc; b=V8xk+fwMyV9OKso/UdQ6Zov5qKok1eYJa+ontOY7kWLINLZIxmZbKCsijby85VKEdj1WkG6OBcbFjEMQa7rbp9AMA/SGfy+c9eLjISQJ/z9jMQkrDv8RD+3xo8NCIKcKevDWPcUgZK+qj8kiQbjNwR8GX9AbGpQFgxayA/cr5x8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=fgD85Cy54IbnpcjIXsCV8u+Kku11ZJqSPGtNrPlvt/zpWYfJ/hBJJVSnqNk25kutgXS5YB3cOU/OIF8f/uXE8SuU+ZRCtrlZfPQTP07nUh1xPJvCA+F/1eGcSCAZRDZpsTfCD7mAjmmjpMyn9pJ6Yf3XwJs1X2Yty/SHVibf/8I= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524453936606.0741039924627; Tue, 30 Jun 2020 06:40:53 -0700 (PDT) Received: from localhost ([::1]:56522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGVI-00031U-Il for importer@patchew.org; Tue, 30 Jun 2020 09:40:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTn-0000xF-CP; Tue, 30 Jun 2020 09:39:19 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:36171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTl-0006Hg-TT; Tue, 30 Jun 2020 09:39:19 -0400 Received: by mail-ed1-x543.google.com with SMTP id dg28so16232499edb.3; Tue, 30 Jun 2020 06:39:17 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=LRQ4E4B9mhCntLThCwvhzuRdnRTQT6wb556Yxds/8mtYujDx/epvCiTfHqW4Zrto+e k+/VMLot5f/ujVjCSPek348c3ufqgFqOah+fbScfmJzVGHKDtUQ74npCkptfL7/nSHrv OK/YQGv6R75/hIYdAqWoBFFsSjRfuX/ohzrXibmLF01D3bY2ESkMKhGujynYfK93E1Vw Uubzunr3w6Az5RQmpE3UpKSq8SNFKdZv34koVOtB/2Q2GY00SzsJgcNPrs0wjJja3Wzl lziI6KVZS8ifdRSmYA/kmcJQ3XbwOXtdUbe7JZLaBr88XmdgA/AD77H5CkE+tjE8yhW0 KrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=hArqCgWRNyP1LOLVKrD4/u/sjqjyAVQ3PIShRcvXlePHdXk36z+EFfDrHwRwv7SQ6H vR6tNzIRlEuxx6krHgIUUXCaSJW208Gfu3R74HSuAQFaNDpaTdvw/4zHTOK2k/GEiZ8T Dlbjgg257+4M0ICep8ucpeeFbbdkqNqBZgVwRwXa7CiChFauxe1j18M3pEXH09L7d8x4 Oc8614ywXVJRn1Xd4UzZ/8Pr0k1DRdd4FMc3MDKsSGcRrfFuCyFKRAhWF9QFOjjgIPRn 2bT/OxeeYXsyoErzxcfpUQ1KP5rAZQbPKVXdNZqJ1UVL075mFD50sQ9bDGeeYbXxfcYn +udw== X-Gm-Message-State: AOAM533wFIsqDm/l+9AHxp7U1Ehf/ePfX/bKkta1KbF3E4QH6YI+mj4l r3o+z58NGZpjdcBQXiFGH+bXvkd5qIc= X-Google-Smtp-Source: ABdhPJxGtwbRjK9kmKgl1UtrZcORC5uF60RHxNz/zCaFQtqrwM7JCM2lzjyJjoiHO1AxnR7wlLVsZg== X-Received: by 2002:a05:6402:30b2:: with SMTP id df18mr23218583edb.229.1593524356073; Tue, 30 Jun 2020 06:39:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 02/17] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Date: Tue, 30 Jun 2020 15:38:56 +0200 Message-Id: <20200630133912.9428-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To make the next commit easier to review, clean this code first. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 97a9d32964..cac8d7d828 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1170,8 +1170,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) sd->data_start =3D addr; sd->data_offset =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + } return sd_r1; =20 default: @@ -1186,8 +1187,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) sd->data_start =3D addr; sd->data_offset =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + } return sd_r1; =20 default: @@ -1232,12 +1234,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; - if (sd_wp_addr(sd, sd->data_start)) + } + if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; - if (sd->csd[14] & 0x30) + } + if (sd->csd[14] & 0x30) { sd->card_status |=3D WP_VIOLATION; + } return sd_r1; =20 default: @@ -1256,12 +1261,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; - if (sd_wp_addr(sd, sd->data_start)) + } + if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; - if (sd->csd[14] & 0x30) + } + if (sd->csd[14] & 0x30) { sd->card_status |=3D WP_VIOLATION; + } return sd_r1; =20 default: --=20 2.21.3