From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A970FC6FD1F for ; Sun, 19 Mar 2023 19:31:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DB5485C52; Sun, 19 Mar 2023 20:31:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="I808MhKG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 825C985B78; Sun, 19 Mar 2023 20:30:18 +0100 (CET) Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F29CD85B23 for ; Sun, 19 Mar 2023 20:30:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pl1-x62c.google.com with SMTP id c18so10414656ple.11 for ; Sun, 19 Mar 2023 12:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679254207; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IwZRpOqQo8qRBvY5E0XEX8qKthtH+KeH/WtasnkgoAg=; b=I808MhKGimPsWqIjvhXV+R6beu5qNBjtPMOV4V7335hbnQ0tJjIVZ4HIzsJfe5zUt9 KcjnWkkUtifFw9UpeLWND0zH7QNJOWsAfK/iyGh1mxviyc5XO4N346srU7K6gJgS9AF0 ZMpvE/gbbayXWtl60AY0zooTytHqi++tlPOn4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679254207; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IwZRpOqQo8qRBvY5E0XEX8qKthtH+KeH/WtasnkgoAg=; b=RscDcv7ZrxizcPkAHM472Z65s+PosXLfNMPyutKbpk+XctlS+llKwXu6395xZVDu8h KeBz1DtLHAucVtsPpLvHdVlz09FN2SRHOuyFoejuKT2aMZY/iNHdQx/bHYO0arWCDFlb RofQUQ+EiKWeNBM2iHwWPEm+wcfg/7B/KuBAeNMm84VpgZqNQoX5tlwm/SGeY5h21Hnk I9+2qCVYOLLvr4MHGC8ZkRH/mkhV65m5YpqxQ2azdXq1vNWaxg0+UijhNpeTyrZxhmtW i/Gqccpd1a4IhAhSic5AXEnE0SOcweoV70SyHDDyFSnRUbCGUtoLF2U5VBJIzIgVF7SN YzLQ== X-Gm-Message-State: AO0yUKW77JqVtGGNpLWV/gJWINw+ypPhp42g02MVAeJbmeuT/f+fTWTd sUxz1DfOe4nAZyY3fO/3AkLrOAyi1FNxohIdEVE= X-Google-Smtp-Source: AK7set+tS0/7vw/IIet67ZloRXXnIyjLBU39vnEtYpMKZ1BltJmFaSBD512nsvEhLfvIEqJDwZQeyw== X-Received: by 2002:a17:902:d486:b0:19e:cfbf:dcbd with SMTP id c6-20020a170902d48600b0019ecfbfdcbdmr16739120plg.44.1679254206990; Sun, 19 Mar 2023 12:30:06 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id bg9-20020a1709028e8900b0019cbabf127dsm5093603plb.182.2023.03.19.12.30.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 12:30:06 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , AKASHI Takahiro , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2] disk: Use a helper function to reduce duplication Date: Mon, 20 Mar 2023 08:29:57 +1300 Message-Id: <20230319192957.1084530-1-sjg@chromium.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Reduce the duplicated code slightly by using a helper function to handle the common code. This reduces the code size very slightly. Signed-off-by: Simon Glass --- Changes in v2: - Rebase to -next disk/disk-uclass.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index d32747e2242d..7f1fd80b2248 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev) return 0; } +static int blk_part_setup(struct udevice *dev, lbaint_t *startp, + lbaint_t blkcnt) +{ + struct disk_part *part; + + part = dev_get_uclass_plat(dev); + if (*startp >= part->gpt_part_info.size) + return -E2BIG; + + if (*startp + blkcnt > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - *startp; + *startp += part->gpt_part_info.start; + + return 0; +} + static ulong part_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *buffer) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->read) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->read(parent, start, blkcnt, buffer); } @@ -92,22 +104,18 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->write) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->write(parent, start, blkcnt, buffer); } @@ -115,22 +123,18 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->erase) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->erase(parent, start, blkcnt); } -- 2.40.0.rc1.284.g88254d51c5-goog