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 98F52C433F5 for ; Fri, 11 Mar 2022 19:12:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59D6083B0A; Fri, 11 Mar 2022 20:12:03 +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="Xof6+vIc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 937B981F9A; Fri, 11 Mar 2022 20:11:45 +0100 (CET) Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 6B93C83B07 for ; Fri, 11 Mar 2022 20:11:38 +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-qv1-xf2d.google.com with SMTP id b12so7736685qvk.1 for ; Fri, 11 Mar 2022 11:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKEfBNNypm/HUPyIGDIxcHqKicj6lLYLbJl56UtUWTU=; b=Xof6+vIckGEIi6CZGwcZ0wQG9kPxd/JVVdDQVZx5zSJYfEsqX2e0zE7Fk8kyqOaEbs 6WdMAoW0mJnFO3koY+ljuQoQzt5nnWcPHj0ha00x6wwp/BG4GSbSkI/jUyei5LIsffFI PjuIVz1LNKOvPxl9bFkEIjFE2raSLMuvCm0cE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKEfBNNypm/HUPyIGDIxcHqKicj6lLYLbJl56UtUWTU=; b=MMifo/S0ZKSL9MbzsHwVt0Ya656+20xa/N9TM4Li7/Kqeyo7VuoH6ZLQZ6zvI0/4GK 1zSwGbrcUXSKa1I6FJlR/q/paFcytyek4P0xCWwL1Z4EVdRG4G1O/1cSfCKXQARJCOvl 589cYoKNvkBAHCsaRRg1xJHbgP2OfmP7kYIgKqMabMSMyeR7XHr6xzo8tx+rDMXijcgI QjxaCxqsciSrAep55bk5gLvCJuotH8UpvR4R0Bmx2LXfw/clSM52+a6R0DfcbLtuE5Fo OaiIPSeDerwA/ySreZ+vXTVnfH8MBiONych4VkzZZvtmC5Di9Xj2QzFbknWJJS4HQ5jA POeA== X-Gm-Message-State: AOAM533CkOT7d7HJKKTnOLszpnEW4K1TP3dafiUaqRUYCxCms2l97RFB CXVUmTDPQkwtaT/iMLef7o06Cxl72Lal4A== X-Google-Smtp-Source: ABdhPJzzekki54zvy8FG3hJjzre9xe8nWszXKFWXqgEJ5siXslktiQZt4dQFGDTogWi3mZ8ELi0OkA== X-Received: by 2002:a05:6214:5188:b0:435:50a5:24a0 with SMTP id kl8-20020a056214518800b0043550a524a0mr9022688qvb.55.1647025896947; Fri, 11 Mar 2022 11:11:36 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass Subject: [PATCH 5/5] disk: Use a helper function to reduce duplication Date: Fri, 11 Mar 2022 12:10:05 -0700 Message-Id: <20220311191005.364540-6-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-1-sjg@chromium.org> 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.5 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 --- 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 72ff62ebf58..7adfe6b2545 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 blk_part_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 blk_part_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 blk_part_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.35.1.723.g4982287a31-goog