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 mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A06C0C433F5 for ; Fri, 19 Nov 2021 20:26:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EE16261AA2 for ; Fri, 19 Nov 2021 20:26:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EE16261AA2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7010383769; Fri, 19 Nov 2021 21:25:42 +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="kIZs19/H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B40F683773; Fri, 19 Nov 2021 21:25:07 +0100 (CET) Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) (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 47D9E8341B for ; Fri, 19 Nov 2021 21:24:29 +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-oi1-x22a.google.com with SMTP id bj13so23972213oib.4 for ; Fri, 19 Nov 2021 12:24:29 -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=gkoxqEnIE+arrYScvtLmWf9p3tUxlMSt1YX1MovK090=; b=kIZs19/HHj19mADE6LM4U7xgtQ/DBA+IRxnAIoOR4eDOwei4xqpFEGJR85lfpzkhfI wJDEqjaEa1W3ksfEmIbEsMFNjXPSGA5McWVVAH7z37MGg9919RsWA8hFfNIdsuQ28aOz Cdm6l6UXo6GmuOAiKon4DSUWm6iEjNPL4ei64= 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=gkoxqEnIE+arrYScvtLmWf9p3tUxlMSt1YX1MovK090=; b=aTGCvTFzIzHOrZ/EIjdxex3M/Zsu55emyVjLpUGUXaDyF71tYpj4rEatW0cWD7ShrN Xki6JOIK6wcs6JUdG6xStRozDH65FU8qZqEanCh+Z1G6EscjcxWhs+NE8hpXL8vCEViB D9BZs0KuezN4jDTkJZUPpAkb0uO3Qw9rJdt6r1LJ6yV1+dRRp1sT5me7/EF1SaYRaE1m YQsb3NDgXtgX1Q8ZxlYu/mJt9aZi1bYo4Owxj7N+gmzXn7idJqXLssQjv5CCdgCMqByT jQujccT4FCnpyJmaW3oONG9KR5TK7pdE/Fa3gZerhUMbOJdqtz4/lkQcnc0wj/X6mpEl ovww== X-Gm-Message-State: AOAM533Hpa+5JLXUR68ASJ+15j5Nbv6zJ94FpEWAIBFDgwwbz2HWUkIn 2Q+nqqhm+Mv/fQa0zQCb0tPwPzAGwNtlbA== X-Google-Smtp-Source: ABdhPJzDwg/JAnUta19gLC8ucFKhdfCtWf/2eDobA9xmliUcb6NEM4O8Y/58iUGvt0fwbQ/u5XH7nA== X-Received: by 2002:a05:6808:dc5:: with SMTP id g5mr2411269oic.58.1637353467527; Fri, 19 Nov 2021 12:24:27 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id bl33sm197093oib.47.2021.11.19.12.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:24:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Tom Rini , Simon Glass Subject: [PATCH 09/23] video: Drop fb_put_byte() el at Date: Fri, 19 Nov 2021 13:23:53 -0700 Message-Id: <20211119202408.1815506-10-sjg@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211119202408.1815506-1-sjg@chromium.org> References: <20211119202408.1815506-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.2 at phobos.denx.de X-Virus-Status: Clean These functions are not used with driver model, nor in any U-Boot boards. Drop them and inline the code. Signed-off-by: Simon Glass --- drivers/video/video_bmp.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 1e6f07ff4b0..7b3e15b7094 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -127,19 +127,6 @@ static void video_display_rle8_bitmap(struct udevice *dev, } #endif -__weak void fb_put_byte(uchar **fb, uchar **from) -{ - *(*fb)++ = *(*from)++; -} - -#if defined(CONFIG_BMP_16BPP) -__weak void fb_put_word(uchar **fb, uchar **from) -{ - *(*fb)++ = *(*from)++; - *(*fb)++ = *(*from)++; -} -#endif /* CONFIG_BMP_16BPP */ - /** * video_splash_align_axis() - Align a single coordinate * @@ -295,7 +282,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, WATCHDOG_RESET(); for (j = 0; j < width; j++) { if (bpix == 8) { - fb_put_byte(&fb, &bmap); + *fb++ = *bmap++; } else if (bpix == 16) { *(uint16_t *)fb = cmap_base[*bmap]; bmap++; @@ -325,9 +312,10 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, case 16: for (i = 0; i < height; ++i) { WATCHDOG_RESET(); - for (j = 0; j < width; j++) - fb_put_word(&fb, &bmap); - + for (j = 0; j < width; j++) { + *fb++ = *bmap++; + *fb++ = *bmap++; + } bmap += (padded_width - width); fb -= width * 2 + priv->line_length; } -- 2.34.0.rc2.393.gf8c9666880-goog